Clojure mode
+(print-grids (take 3 (iterate step grid)) 5 5)MIME types defined: text/x-clojure.
- 
+
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/cobol/cobol.js b/public/vendor/plugins/codemirror/mode/cobol/cobol.js
index 897022b18c..275857b4bd 100644
--- a/public/vendor/plugins/codemirror/mode/cobol/cobol.js
+++ b/public/vendor/plugins/codemirror/mode/cobol/cobol.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
/**
* Author: Gautam Mehta
diff --git a/public/vendor/plugins/codemirror/mode/cobol/index.html b/public/vendor/plugins/codemirror/mode/cobol/index.html
index 4352419a0c..1e08740529 100644
--- a/public/vendor/plugins/codemirror/mode/cobol/index.html
+++ b/public/vendor/plugins/codemirror/mode/cobol/index.html
@@ -39,7 +39,7 @@
.CodeMirror-activeline-background {background: #555555 !important;}
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/coffeescript/coffeescript.js b/public/vendor/plugins/codemirror/mode/coffeescript/coffeescript.js
index adf2184fd7..a54e9d5ed0 100644
--- a/public/vendor/plugins/codemirror/mode/coffeescript/coffeescript.js
+++ b/public/vendor/plugins/codemirror/mode/coffeescript/coffeescript.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
/**
* Link to the project's GitHub page:
@@ -349,6 +349,10 @@ CodeMirror.defineMode("coffeescript", function(conf, parserConf) {
return external;
});
+// IANA registered media type
+// https://www.iana.org/assignments/media-types/
+CodeMirror.defineMIME("application/vnd.coffeescript", "coffeescript");
+
CodeMirror.defineMIME("text/x-coffeescript", "coffeescript");
CodeMirror.defineMIME("text/coffeescript", "coffeescript");
diff --git a/public/vendor/plugins/codemirror/mode/coffeescript/index.html b/public/vendor/plugins/codemirror/mode/coffeescript/index.html
index 93a5f4f309..650ccf5db8 100644
--- a/public/vendor/plugins/codemirror/mode/coffeescript/index.html
+++ b/public/vendor/plugins/codemirror/mode/coffeescript/index.html
@@ -9,7 +9,7 @@
-
CodeMirror
+ CodeMirror
- Home
@@ -733,7 +733,7 @@ wrapper::value = -> this._wrapped
var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
-
MIME types defined:
+text/x-coffeescript.MIME types defined:
application/vnd.coffeescript,text/coffeescript,text/x-coffeescript.The CoffeeScript mode was written by Jeff Pickhardt.
diff --git a/public/vendor/plugins/codemirror/mode/commonlisp/commonlisp.js b/public/vendor/plugins/codemirror/mode/commonlisp/commonlisp.js index fb1f99c631..52abbb25c6 100644 --- a/public/vendor/plugins/codemirror/mode/commonlisp/commonlisp.js +++ b/public/vendor/plugins/codemirror/mode/commonlisp/commonlisp.js @@ -1,5 +1,5 @@ // CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE +// Distributed under an MIT license: https://codemirror.net/LICENSE (function(mod) { if (typeof exports == "object" && typeof module == "object") // CommonJS @@ -43,11 +43,12 @@ CodeMirror.defineMode("commonlisp", function (config) { else { stream.skipToEnd(); return "error"; } } else if (ch == "#") { var ch = stream.next(); - if (ch == "[") { type = "open"; return "bracket"; } + if (ch == "(") { type = "open"; return "bracket"; } else if (/[+\-=\.']/.test(ch)) return null; else if (/\d/.test(ch) && stream.match(/^\d*#/)) return null; else if (ch == "|") return (state.tokenize = inComment)(stream, state); else if (ch == ":") { readSym(stream); return "meta"; } + else if (ch == "\\") { stream.next(); readSym(stream); return "string-2" } else return "error"; } else { var name = readSym(stream); diff --git a/public/vendor/plugins/codemirror/mode/commonlisp/index.html b/public/vendor/plugins/codemirror/mode/commonlisp/index.html index f2bf4522d6..a5b907e831 100644 --- a/public/vendor/plugins/codemirror/mode/commonlisp/index.html +++ b/public/vendor/plugins/codemirror/mode/commonlisp/index.html @@ -9,7 +9,7 @@-CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/crystal/crystal.js b/public/vendor/plugins/codemirror/mode/crystal/crystal.js
index e63627cee8..5c601c6ab3 100644
--- a/public/vendor/plugins/codemirror/mode/crystal/crystal.js
+++ b/public/vendor/plugins/codemirror/mode/crystal/crystal.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -29,26 +29,22 @@
var types = /^[A-Z_\u009F-\uFFFF][a-zA-Z0-9_\u009F-\uFFFF]*/;
var keywords = wordRegExp([
"abstract", "alias", "as", "asm", "begin", "break", "case", "class", "def", "do",
- "else", "elsif", "end", "ensure", "enum", "extend", "for", "fun", "if", "ifdef",
+ "else", "elsif", "end", "ensure", "enum", "extend", "for", "fun", "if",
"include", "instance_sizeof", "lib", "macro", "module", "next", "of", "out", "pointerof",
- "private", "protected", "rescue", "return", "require", "sizeof", "struct",
- "super", "then", "type", "typeof", "union", "unless", "until", "when", "while", "with",
- "yield", "__DIR__", "__FILE__", "__LINE__"
+ "private", "protected", "rescue", "return", "require", "select", "sizeof", "struct",
+ "super", "then", "type", "typeof", "uninitialized", "union", "unless", "until", "when", "while", "with",
+ "yield", "__DIR__", "__END_LINE__", "__FILE__", "__LINE__"
]);
var atomWords = wordRegExp(["true", "false", "nil", "self"]);
var indentKeywordsArray = [
"def", "fun", "macro",
"class", "module", "struct", "lib", "enum", "union",
- "if", "unless", "case", "while", "until", "begin", "then",
- "do",
- "for", "ifdef"
+ "do", "for"
];
var indentKeywords = wordRegExp(indentKeywordsArray);
- var dedentKeywordsArray = [
- "end",
- "else", "elsif",
- "rescue", "ensure"
- ];
+ var indentExpressionKeywordsArray = ["if", "unless", "case", "while", "until", "begin", "then"];
+ var indentExpressionKeywords = wordRegExp(indentExpressionKeywordsArray);
+ var dedentKeywordsArray = ["end", "else", "elsif", "rescue", "ensure"];
var dedentKeywords = wordRegExp(dedentKeywordsArray);
var dedentPunctualsArray = ["\\)", "\\}", "\\]"];
var dedentPunctuals = new RegExp("^(?:" + dedentPunctualsArray.join("|") + ")$");
@@ -90,12 +86,15 @@
} else if (state.lastToken == ".") {
return "property";
} else if (keywords.test(matched)) {
- if (state.lastToken != "abstract" && indentKeywords.test(matched)) {
- if (!(matched == "fun" && state.blocks.indexOf("lib") >= 0)) {
+ if (indentKeywords.test(matched)) {
+ if (!(matched == "fun" && state.blocks.indexOf("lib") >= 0) && !(matched == "def" && state.lastToken == "abstract")) {
state.blocks.push(matched);
state.currentIndent += 1;
}
- } else if (dedentKeywords.test(matched)) {
+ } else if ((state.lastStyle == "operator" || !state.lastStyle) && indentExpressionKeywords.test(matched)) {
+ state.blocks.push(matched);
+ state.currentIndent += 1;
+ } else if (matched == "end") {
state.blocks.pop();
state.currentIndent -= 1;
}
@@ -124,12 +123,6 @@
return "variable-2";
}
- // Global variables
- if (stream.eat("$")) {
- stream.eat(/[0-9]+|\?/) || stream.match(idents) || stream.match(types);
- return "variable-3";
- }
-
// Constants and types
if (stream.match(types)) {
return "tag";
@@ -165,6 +158,9 @@
} else if (stream.match("%w")) {
embed = false;
delim = stream.next();
+ } else if (stream.match("%q")) {
+ embed = false;
+ delim = stream.next();
} else {
if(delim = stream.match(/^%([^\w\s=])/)) {
delim = delim[1];
@@ -183,6 +179,11 @@
return chain(tokenQuote(delim, style, embed), stream, state);
}
+ // Here Docs
+ if (matched = stream.match(/^<<-('?)([A-Z]\w*)\1/)) {
+ return chain(tokenHereDoc(matched[2], !matched[1]), stream, state)
+ }
+
// Characters
if (stream.eat("'")) {
stream.match(/^(?:[^']|\\(?:[befnrtv0'"]|[0-7]{3}|u(?:[0-9a-fA-F]{4}|\{[0-9a-fA-F]{1,6}\})))/);
@@ -202,7 +203,7 @@
return "number";
}
- if (stream.eat(/\d/)) {
+ if (stream.eat(/^\d/)) {
stream.match(/^\d*(?:\.\d+)?(?:[eE][+-]?\d+)?/);
return "number";
}
@@ -339,7 +340,7 @@
return style;
}
- escaped = ch == "\\";
+ escaped = embed && ch == "\\";
} else {
stream.next();
escaped = false;
@@ -350,12 +351,52 @@
};
}
+ function tokenHereDoc(phrase, embed) {
+ return function (stream, state) {
+ if (stream.sol()) {
+ stream.eatSpace()
+ if (stream.match(phrase)) {
+ state.tokenize.pop();
+ return "string";
+ }
+ }
+
+ var escaped = false;
+ while (stream.peek()) {
+ if (!escaped) {
+ if (stream.match("{%", false)) {
+ state.tokenize.push(tokenMacro("%", "%"));
+ return "string";
+ }
+
+ if (stream.match("{{", false)) {
+ state.tokenize.push(tokenMacro("{", "}"));
+ return "string";
+ }
+
+ if (embed && stream.match("#{", false)) {
+ state.tokenize.push(tokenNest("#{", "}", "meta"));
+ return "string";
+ }
+
+ escaped = embed && stream.next() == "\\";
+ } else {
+ stream.next();
+ escaped = false;
+ }
+ }
+
+ return "string";
+ }
+ }
+
return {
startState: function () {
return {
tokenize: [tokenBase],
currentIndent: 0,
lastToken: null,
+ lastStyle: null,
blocks: []
};
},
@@ -366,6 +407,7 @@
if (style && style != "comment") {
state.lastToken = token;
+ state.lastStyle = style;
}
return style;
diff --git a/public/vendor/plugins/codemirror/mode/crystal/index.html b/public/vendor/plugins/codemirror/mode/crystal/index.html
index ec03e25094..ae4218eec5 100644
--- a/public/vendor/plugins/codemirror/mode/crystal/index.html
+++ b/public/vendor/plugins/codemirror/mode/crystal/index.html
@@ -14,7 +14,7 @@
-
CodeMirror
+ CodeMirror
- Home
@@ -48,8 +48,6 @@ puts "Listening on http://0.0.0.0:8080"
server.listen
module Foo
- def initialize(@foo); end
-
abstract def abstract_method : String
@[AlwaysInline]
@@ -58,7 +56,8 @@ module Foo
end
struct Foo
- def initialize(@foo); end
+ def initialize(@foo : ::Foo)
+ end
def hello_world
@foo.abstract_method
@@ -71,8 +70,7 @@ class Bar
@@foobar = 12345
- def initialize(@bar)
- super(@bar.not_nil! + 100)
+ def initialize(@bar : Int32)
end
macro alias_method(name, method)
@@ -87,11 +85,10 @@ class Bar
alias_method abstract_method, a_method
- macro def show_instance_vars : Nil
+ def show_instance_vars : Nil
{% for var in @type.instance_vars %}
puts "@{{ var }} = #{ @{{ var }} }"
{% end %}
- nil
end
end
@@ -101,9 +98,9 @@ lib LibC
fun c_puts = "puts"(str : Char*) : Int
end
-$baz = Baz.new(100)
-$baz.show_instance_vars
-$baz.with_foofoo do
+baz = Baz.new(100)
+baz.show_instance_vars
+baz.with_foofoo do
LibC.c_puts hello_world
end
diff --git a/public/vendor/plugins/codemirror/mode/css/css.js b/public/vendor/plugins/codemirror/mode/css/css.js
index ea7bd01d84..05742c5c45 100644
--- a/public/vendor/plugins/codemirror/mode/css/css.js
+++ b/public/vendor/plugins/codemirror/mode/css/css.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -28,6 +28,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
colorKeywords = parserConfig.colorKeywords || {},
valueKeywords = parserConfig.valueKeywords || {},
allowNested = parserConfig.allowNested,
+ lineComment = parserConfig.lineComment,
supportsAtComponent = parserConfig.supportsAtComponent === true;
var type, override;
@@ -62,7 +63,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
if (/[\d.]/.test(stream.peek())) {
stream.eatWhile(/[\w.%]/);
return ret("number", "unit");
- } else if (stream.match(/^-[\w\\\-]+/)) {
+ } else if (stream.match(/^-[\w\\\-]*/)) {
stream.eatWhile(/[\w\\\-]/);
if (stream.match(/^\s*:/, false))
return ret("variable-2", "variable-definition");
@@ -76,12 +77,11 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
return ret("qualifier", "qualifier");
} else if (/[:;{}\[\]\(\)]/.test(ch)) {
return ret(null, ch);
- } else if ((ch == "u" && stream.match(/rl(-prefix)?\(/)) ||
- (ch == "d" && stream.match("omain(")) ||
- (ch == "r" && stream.match("egexp("))) {
- stream.backUp(1);
- state.tokenize = tokenParenthesized;
- return ret("property", "word");
+ } else if (stream.match(/[\w-.]+(?=\()/)) {
+ if (/^(url(-prefix)?|domain|regexp)$/.test(stream.current().toLowerCase())) {
+ state.tokenize = tokenParenthesized;
+ }
+ return ret("variable callee", "variable");
} else if (/[\w\\\-]/.test(ch)) {
stream.eatWhile(/[\w\\\-]/);
return ret("property", "word");
@@ -161,16 +161,16 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
return pushContext(state, stream, "block");
} else if (type == "}" && state.context.prev) {
return popContext(state);
- } else if (supportsAtComponent && /@component/.test(type)) {
+ } else if (supportsAtComponent && /@component/i.test(type)) {
return pushContext(state, stream, "atComponentBlock");
- } else if (/^@(-moz-)?document$/.test(type)) {
+ } else if (/^@(-moz-)?document$/i.test(type)) {
return pushContext(state, stream, "documentTypes");
- } else if (/^@(media|supports|(-moz-)?document|import)$/.test(type)) {
+ } else if (/^@(media|supports|(-moz-)?document|import)$/i.test(type)) {
return pushContext(state, stream, "atBlock");
- } else if (/^@(font-face|counter-style)/.test(type)) {
+ } else if (/^@(font-face|counter-style)/i.test(type)) {
state.stateArg = type;
return "restricted_atBlock_before";
- } else if (/^@(-(moz|ms|o|webkit)-)?keyframes$/.test(type)) {
+ } else if (/^@(-(moz|ms|o|webkit)-)?keyframes$/i.test(type)) {
return "keyframes";
} else if (type && type.charAt(0) == "@") {
return pushContext(state, stream, "at");
@@ -253,6 +253,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
};
states.pseudo = function(type, stream, state) {
+ if (type == "meta") return "pseudo";
+
if (type == "word") {
override = "variable-3";
return state.context.type;
@@ -380,7 +382,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
style = style[0];
}
override = style;
- state.state = states[state.state](type, stream, state);
+ if (type != "comment")
+ state.state = states[state.state](type, stream, state);
return override;
},
@@ -398,7 +401,6 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
ch == "{" && (cx.type == "at" || cx.type == "atBlock")) {
// Dedent relative to current context.
indent = Math.max(0, cx.indent - indentUnit);
- cx = cx.prev;
}
}
return indent;
@@ -407,6 +409,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
electricChars: "}",
blockCommentStart: "/*",
blockCommentEnd: "*/",
+ blockCommentContinue: " * ",
+ lineComment: lineComment,
fold: "brace"
};
});
@@ -414,7 +418,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
function keySet(array) {
var keys = {};
for (var i = 0; i < array.length; ++i) {
- keys[array[i]] = true;
+ keys[array[i].toLowerCase()] = true;
}
return keys;
}
@@ -468,7 +472,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
"border-top-left-radius", "border-top-right-radius", "border-top-style",
"border-top-width", "border-width", "bottom", "box-decoration-break",
"box-shadow", "box-sizing", "break-after", "break-before", "break-inside",
- "caption-side", "clear", "clip", "color", "color-profile", "column-count",
+ "caption-side", "caret-color", "clear", "clip", "color", "color-profile", "column-count",
"column-fill", "column-gap", "column-rule", "column-rule-color",
"column-rule-style", "column-rule-width", "column-span", "column-width",
"columns", "content", "counter-increment", "counter-reset", "crop", "cue",
@@ -489,14 +493,14 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
"grid-row-start", "grid-template", "grid-template-areas", "grid-template-columns",
"grid-template-rows", "hanging-punctuation", "height", "hyphens",
"icon", "image-orientation", "image-rendering", "image-resolution",
- "inline-box-align", "justify-content", "left", "letter-spacing",
+ "inline-box-align", "justify-content", "justify-items", "justify-self", "left", "letter-spacing",
"line-break", "line-height", "line-stacking", "line-stacking-ruby",
"line-stacking-shift", "line-stacking-strategy", "list-style",
"list-style-image", "list-style-position", "list-style-type", "margin",
"margin-bottom", "margin-left", "margin-right", "margin-top",
- "marker-offset", "marks", "marquee-direction", "marquee-loop",
+ "marks", "marquee-direction", "marquee-loop",
"marquee-play-count", "marquee-speed", "marquee-style", "max-height",
- "max-width", "min-height", "min-width", "move-to", "nav-down", "nav-index",
+ "max-width", "min-height", "min-width", "mix-blend-mode", "move-to", "nav-down", "nav-index",
"nav-left", "nav-right", "nav-up", "object-fit", "object-position",
"opacity", "order", "orphans", "outline",
"outline-color", "outline-offset", "outline-style", "outline-width",
@@ -504,7 +508,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
"padding", "padding-bottom", "padding-left", "padding-right", "padding-top",
"page", "page-break-after", "page-break-before", "page-break-inside",
"page-policy", "pause", "pause-after", "pause-before", "perspective",
- "perspective-origin", "pitch", "pitch-range", "play-during", "position",
+ "perspective-origin", "pitch", "pitch-range", "place-content", "place-items", "place-self", "play-during", "position",
"presentation-level", "punctuation-trim", "quotes", "region-break-after",
"region-break-before", "region-break-inside", "region-fragment",
"rendering-intent", "resize", "rest", "rest-after", "rest-before", "richness",
@@ -522,9 +526,9 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
"text-wrap", "top", "transform", "transform-origin", "transform-style",
"transition", "transition-delay", "transition-duration",
"transition-property", "transition-timing-function", "unicode-bidi",
- "vertical-align", "visibility", "voice-balance", "voice-duration",
+ "user-select", "vertical-align", "visibility", "voice-balance", "voice-duration",
"voice-family", "voice-pitch", "voice-range", "voice-rate", "voice-stress",
- "voice-volume", "volume", "white-space", "widows", "width", "word-break",
+ "voice-volume", "volume", "white-space", "widows", "width", "will-change", "word-break",
"word-spacing", "word-wrap", "z-index",
// SVG-specific
"clip-path", "clip-rule", "mask", "enable-background", "filter", "flood-color",
@@ -589,7 +593,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
"above", "absolute", "activeborder", "additive", "activecaption", "afar",
"after-white-space", "ahead", "alias", "all", "all-scroll", "alphabetic", "alternate",
"always", "amharic", "amharic-abegede", "antialiased", "appworkspace",
- "arabic-indic", "armenian", "asterisks", "attr", "auto", "avoid", "avoid-column", "avoid-page",
+ "arabic-indic", "armenian", "asterisks", "attr", "auto", "auto-flow", "avoid", "avoid-column", "avoid-page",
"avoid-region", "background", "backwards", "baseline", "below", "bidi-override", "binary",
"bengali", "blink", "block", "block-axis", "bold", "bolder", "border", "border-box",
"both", "bottom", "break", "break-all", "break-word", "bullets", "button", "button-bevel",
@@ -598,7 +602,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
"cell", "center", "checkbox", "circle", "cjk-decimal", "cjk-earthly-branch",
"cjk-heavenly-stem", "cjk-ideographic", "clear", "clip", "close-quote",
"col-resize", "collapse", "color", "color-burn", "color-dodge", "column", "column-reverse",
- "compact", "condensed", "contain", "content",
+ "compact", "condensed", "contain", "content", "contents",
"content-box", "context-menu", "continuous", "copy", "counter", "counters", "cover", "crop",
"cross", "crosshair", "currentcolor", "cursive", "cyclic", "darken", "dashed", "decimal",
"decimal-leading-zero", "default", "default-button", "dense", "destination-atop",
@@ -641,7 +645,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
"mix", "mongolian", "monospace", "move", "multiple", "multiply", "myanmar", "n-resize",
"narrower", "ne-resize", "nesw-resize", "no-close-quote", "no-drop",
"no-open-quote", "no-repeat", "none", "normal", "not-allowed", "nowrap",
- "ns-resize", "numbers", "numeric", "nw-resize", "nwse-resize", "oblique", "octal", "open-quote",
+ "ns-resize", "numbers", "numeric", "nw-resize", "nwse-resize", "oblique", "octal", "opacity", "open-quote",
"optimizeLegibility", "optimizeSpeed", "oriya", "oromo", "outset",
"outside", "outside-shape", "overlay", "overline", "padding", "padding-box",
"painted", "page", "paused", "persian", "perspective", "plus-darker", "plus-lighter",
@@ -653,17 +657,17 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
"rgb", "rgba", "ridge", "right", "rotate", "rotate3d", "rotateX", "rotateY",
"rotateZ", "round", "row", "row-resize", "row-reverse", "rtl", "run-in", "running",
"s-resize", "sans-serif", "saturation", "scale", "scale3d", "scaleX", "scaleY", "scaleZ", "screen",
- "scroll", "scrollbar", "se-resize", "searchfield",
+ "scroll", "scrollbar", "scroll-position", "se-resize", "searchfield",
"searchfield-cancel-button", "searchfield-decoration",
- "searchfield-results-button", "searchfield-results-decoration",
+ "searchfield-results-button", "searchfield-results-decoration", "self-start", "self-end",
"semi-condensed", "semi-expanded", "separate", "serif", "show", "sidama",
"simp-chinese-formal", "simp-chinese-informal", "single",
"skew", "skewX", "skewY", "skip-white-space", "slide", "slider-horizontal",
"slider-vertical", "sliderthumb-horizontal", "sliderthumb-vertical", "slow",
"small", "small-caps", "small-caption", "smaller", "soft-light", "solid", "somali",
- "source-atop", "source-in", "source-out", "source-over", "space", "space-around", "space-between", "spell-out", "square",
+ "source-atop", "source-in", "source-out", "source-over", "space", "space-around", "space-between", "space-evenly", "spell-out", "square",
"square-button", "start", "static", "status-bar", "stretch", "stroke", "sub",
- "subpixel-antialiased", "super", "sw-resize", "symbolic", "symbols", "table",
+ "subpixel-antialiased", "super", "sw-resize", "symbolic", "symbols", "system-ui", "table",
"table-caption", "table-cell", "table-column", "table-column-group",
"table-footer-group", "table-header-group", "table-row", "table-row-group",
"tamil",
@@ -671,9 +675,9 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
"thick", "thin", "threeddarkshadow", "threedface", "threedhighlight",
"threedlightshadow", "threedshadow", "tibetan", "tigre", "tigrinya-er",
"tigrinya-er-abegede", "tigrinya-et", "tigrinya-et-abegede", "to", "top",
- "trad-chinese-formal", "trad-chinese-informal",
+ "trad-chinese-formal", "trad-chinese-informal", "transform",
"translate", "translate3d", "translateX", "translateY", "translateZ",
- "transparent", "ultra-condensed", "ultra-expanded", "underline", "up",
+ "transparent", "ultra-condensed", "ultra-expanded", "underline", "unset", "up",
"upper-alpha", "upper-armenian", "upper-greek", "upper-hexadecimal",
"upper-latin", "upper-norwegian", "upper-roman", "uppercase", "urdu", "url",
"var", "vertical", "vertical-text", "visible", "visibleFill", "visiblePainted",
@@ -730,6 +734,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
valueKeywords: valueKeywords,
fontProperties: fontProperties,
allowNested: true,
+ lineComment: "//",
tokenHooks: {
"/": function(stream, state) {
if (stream.eat("/")) {
@@ -743,8 +748,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
}
},
":": function(stream) {
- if (stream.match(/\s*\{/))
- return [null, "{"];
+ if (stream.match(/\s*\{/, false))
+ return [null, null]
return false;
},
"$": function(stream) {
@@ -772,6 +777,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
valueKeywords: valueKeywords,
fontProperties: fontProperties,
allowNested: true,
+ lineComment: "//",
tokenHooks: {
"/": function(stream, state) {
if (stream.eat("/")) {
@@ -786,7 +792,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
},
"@": function(stream) {
if (stream.eat("{")) return [null, "interpolation"];
- if (stream.match(/^(charset|document|font-face|import|(-(moz|ms|o|webkit)-)?keyframes|media|namespace|page|supports)\b/, false)) return false;
+ if (stream.match(/^(charset|document|font-face|import|(-(moz|ms|o|webkit)-)?keyframes|media|namespace|page|supports)\b/i, false)) return false;
stream.eatWhile(/[\w\\\-]/);
if (stream.match(/^\s*:/, false))
return ["variable-2", "variable-definition"];
diff --git a/public/vendor/plugins/codemirror/mode/css/gss.html b/public/vendor/plugins/codemirror/mode/css/gss.html
index 232fe8c12b..447929bf21 100644
--- a/public/vendor/plugins/codemirror/mode/css/gss.html
+++ b/public/vendor/plugins/codemirror/mode/css/gss.html
@@ -8,11 +8,12 @@
+
-
CodeMirror
+ CodeMirror
- Home
@@ -90,7 +91,7 @@ body {
var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
extraKeys: {"Ctrl-Space": "autocomplete"},
lineNumbers: true,
- matchBrackets: "text/x-less",
+ matchBrackets: true,
mode: "text/x-gss"
});
diff --git a/public/vendor/plugins/codemirror/mode/css/gss_test.js b/public/vendor/plugins/codemirror/mode/css/gss_test.js
index d56e592803..2401bc4968 100644
--- a/public/vendor/plugins/codemirror/mode/css/gss_test.js
+++ b/public/vendor/plugins/codemirror/mode/css/gss_test.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function() {
"use strict";
diff --git a/public/vendor/plugins/codemirror/mode/css/index.html b/public/vendor/plugins/codemirror/mode/css/index.html
index 2d2b9b073c..b39f126597 100644
--- a/public/vendor/plugins/codemirror/mode/css/index.html
+++ b/public/vendor/plugins/codemirror/mode/css/index.html
@@ -12,7 +12,7 @@
-
CodeMirror
+ CodeMirror
- Home
@@ -64,7 +64,7 @@ code {
diff --git a/public/vendor/plugins/codemirror/mode/css/less.html b/public/vendor/plugins/codemirror/mode/css/less.html
index adf7427d30..6ceb7a0342 100644
--- a/public/vendor/plugins/codemirror/mode/css/less.html
+++ b/public/vendor/plugins/codemirror/mode/css/less.html
@@ -10,7 +10,7 @@
-
CodeMirror
+ CodeMirror
- Home
@@ -140,8 +140,8 @@ fieldset span button, fieldset span input[type="file"] {
diff --git a/public/vendor/plugins/codemirror/mode/css/less_test.js b/public/vendor/plugins/codemirror/mode/css/less_test.js
index dd821558b0..abeb6a2040 100644
--- a/public/vendor/plugins/codemirror/mode/css/less_test.js
+++ b/public/vendor/plugins/codemirror/mode/css/less_test.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function() {
"use strict";
@@ -10,8 +10,8 @@
MT("variable",
"[variable-2 @base]: [atom #f04615];",
"[qualifier .class] {",
- " [property width]: [variable percentage]([number 0.5]); [comment // returns `50%`]",
- " [property color]: [variable saturate]([variable-2 @base], [number 5%]);",
+ " [property width]: [variable&callee percentage]([number 0.5]); [comment // returns `50%`]",
+ " [property color]: [variable&callee saturate]([variable-2 @base], [number 5%]);",
"}");
MT("amp",
@@ -26,10 +26,10 @@
MT("mixin",
"[qualifier .mixin] ([variable dark]; [variable-2 @color]) {",
- " [property color]: [atom darken]([variable-2 @color], [number 10%]);",
+ " [property color]: [variable&callee darken]([variable-2 @color], [number 10%]);",
"}",
"[qualifier .mixin] ([variable light]; [variable-2 @color]) {",
- " [property color]: [atom lighten]([variable-2 @color], [number 10%]);",
+ " [property color]: [variable&callee lighten]([variable-2 @color], [number 10%]);",
"}",
"[qualifier .mixin] ([variable-2 @_]; [variable-2 @color]) {",
" [property display]: [atom block];",
diff --git a/public/vendor/plugins/codemirror/mode/css/scss.html b/public/vendor/plugins/codemirror/mode/css/scss.html
index f8e4d37368..3e42ea6535 100644
--- a/public/vendor/plugins/codemirror/mode/css/scss.html
+++ b/public/vendor/plugins/codemirror/mode/css/scss.html
@@ -6,10 +6,11 @@
+
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/css/scss_test.js b/public/vendor/plugins/codemirror/mode/css/scss_test.js
index 785921b39c..68afc664b6 100644
--- a/public/vendor/plugins/codemirror/mode/css/scss_test.js
+++ b/public/vendor/plugins/codemirror/mode/css/scss_test.js
@@ -1,24 +1,24 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function() {
var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-scss");
function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), "scss"); }
MT('url_with_quotation',
- "[tag foo] { [property background]:[atom url]([string test.jpg]) }");
+ "[tag foo] { [property background]:[variable&callee url]([string test.jpg]) }");
MT('url_with_double_quotes',
- "[tag foo] { [property background]:[atom url]([string \"test.jpg\"]) }");
+ "[tag foo] { [property background]:[variable&callee url]([string \"test.jpg\"]) }");
MT('url_with_single_quotes',
- "[tag foo] { [property background]:[atom url]([string \'test.jpg\']) }");
+ "[tag foo] { [property background]:[variable&callee url]([string \'test.jpg\']) }");
MT('string',
"[def @import] [string \"compass/css3\"]");
MT('important_keyword',
- "[tag foo] { [property background]:[atom url]([string \'test.jpg\']) [keyword !important] }");
+ "[tag foo] { [property background]:[variable&callee url]([string \'test.jpg\']) [keyword !important] }");
MT('variable',
"[variable-2 $blue]:[atom #333]");
@@ -95,7 +95,7 @@
MT('indent_parentheses',
"[tag foo] {",
- " [property color]: [atom darken]([variable-2 $blue],",
+ " [property color]: [variable&callee darken]([variable-2 $blue],",
" [number 9%]);",
"}");
diff --git a/public/vendor/plugins/codemirror/mode/css/test.js b/public/vendor/plugins/codemirror/mode/css/test.js
index 7a496fb091..64352d74fc 100644
--- a/public/vendor/plugins/codemirror/mode/css/test.js
+++ b/public/vendor/plugins/codemirror/mode/css/test.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function() {
var mode = CodeMirror.getMode({indentUnit: 2}, "css");
@@ -24,6 +24,9 @@
MT("atMediaUnknownFeatureValueKeyword",
"[def @media] ([property orientation]: [error upsidedown]) { }");
+ MT("atMediaUppercase",
+ "[def @MEDIA] ([property orienTAtion]: [keyword landScape]) { }");
+
MT("tagSelector",
"[tag foo] { }");
@@ -86,11 +89,11 @@
"[tag foo] { [property margin]: [number 0]; [property padding]: [number 0]; }");
MT("tagTwoPropertiesURL",
- "[tag foo] { [property background]: [atom url]([string //example.com/foo.png]); [property padding]: [number 0]; }");
+ "[tag foo] { [property background]: [variable&callee url]([string //example.com/foo.png]); [property padding]: [number 0]; }");
MT("indent_tagSelector",
"[tag strong], [tag em] {",
- " [property background]: [atom rgba](",
+ " [property background]: [variable&callee rgba](",
" [number 255], [number 255], [number 0], [number .2]",
" );",
"}");
@@ -111,7 +114,7 @@
MT("indent_parentheses",
"[tag foo]:[variable-3 before] {",
- " [property background]: [atom url](",
+ " [property background]: [variable&callee url](",
"[string blahblah]",
"[string etc]",
"[string ]) [keyword !important];",
@@ -121,20 +124,20 @@
"[def @font-face] {",
" [property font-family]: [string 'myfont'];",
" [error nonsense]: [string 'abc'];",
- " [property src]: [atom url]([string http://blah]),",
- " [atom url]([string http://foo]);",
+ " [property src]: [variable&callee url]([string http://blah]),",
+ " [variable&callee url]([string http://foo]);",
"}");
MT("empty_url",
- "[def @import] [atom url]() [attribute screen];");
+ "[def @import] [variable&callee url]() [attribute screen];");
MT("parens",
"[qualifier .foo] {",
- " [property background-image]: [variable fade]([atom #000], [number 20%]);",
- " [property border-image]: [atom linear-gradient](",
+ " [property background-image]: [variable&callee fade]([atom #000], [number 20%]);",
+ " [property border-image]: [variable&callee linear-gradient](",
" [atom to] [atom bottom],",
- " [variable fade]([atom #000], [number 20%]) [number 0%],",
- " [variable fade]([atom #000], [number 20%]) [number 100%]",
+ " [variable&callee fade]([atom #000], [number 20%]) [number 0%],",
+ " [variable&callee fade]([atom #000], [number 20%]) [number 100%]",
" );",
"}");
@@ -143,7 +146,15 @@
" [variable-2 --main-color]: [atom #06c];",
"}",
"[tag h1][builtin #foo] {",
- " [property color]: [atom var]([variable-2 --main-color]);",
+ " [property color]: [variable&callee var]([variable-2 --main-color]);",
+ "}");
+
+ MT("blank_css_variable",
+ ":[variable-3 root] {",
+ " [variable-2 --]: [atom #06c];",
+ "}",
+ "[tag h1][builtin #foo] {",
+ " [property color]: [variable&callee var]([variable-2 --]);",
"}");
MT("supports",
@@ -152,10 +163,10 @@
"}");
MT("document",
- "[def @document] [tag url]([string http://blah]),",
- " [tag url-prefix]([string https://]),",
- " [tag domain]([string blah.com]),",
- " [tag regexp]([string \".*blah.+\"]) {",
+ "[def @document] [variable&callee url]([string http://blah]),",
+ " [variable&callee url-prefix]([string https://]),",
+ " [variable&callee domain]([string blah.com]),",
+ " [variable&callee regexp]([string \".*blah.+\"]) {",
" [builtin #id] {",
" [property background-color]: [keyword white];",
" }",
@@ -165,16 +176,16 @@
"}");
MT("document_url",
- "[def @document] [tag url]([string http://blah]) { [qualifier .class] { } }");
+ "[def @document] [variable&callee url]([string http://blah]) { [qualifier .class] { } }");
MT("document_urlPrefix",
- "[def @document] [tag url-prefix]([string https://]) { [builtin #id] { } }");
+ "[def @document] [variable&callee url-prefix]([string https://]) { [builtin #id] { } }");
MT("document_domain",
- "[def @document] [tag domain]([string blah.com]) { [tag foo] { } }");
+ "[def @document] [variable&callee domain]([string blah.com]) { [tag foo] { } }");
MT("document_regexp",
- "[def @document] [tag regexp]([string \".*blah.+\"]) { [builtin #id] { } }");
+ "[def @document] [variable&callee regexp]([string \".*blah.+\"]) { [builtin #id] { } }");
MT("counter-style",
"[def @counter-style] [variable binary] {",
@@ -196,5 +207,11 @@
"[tag ol][qualifier .roman] { [property list-style]: [variable simple-roman]; }");
MT("counter-style-symbols",
- "[tag ol] { [property list-style]: [atom symbols]([atom cyclic] [string \"*\"] [string \"\\2020\"] [string \"\\2021\"] [string \"\\A7\"]); }");
+ "[tag ol] { [property list-style]: [variable&callee symbols]([atom cyclic] [string \"*\"] [string \"\\2020\"] [string \"\\2021\"] [string \"\\A7\"]); }");
+
+ MT("comment-does-not-disrupt",
+ "[def @font-face] [comment /* foo */] {",
+ " [property src]: [variable&callee url]([string x]);",
+ " [property font-family]: [variable One];",
+ "}")
})();
diff --git a/public/vendor/plugins/codemirror/mode/cypher/cypher.js b/public/vendor/plugins/codemirror/mode/cypher/cypher.js
index 107e4f6d21..8b22e65db8 100644
--- a/public/vendor/plugins/codemirror/mode/cypher/cypher.js
+++ b/public/vendor/plugins/codemirror/mode/cypher/cypher.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
// By the Neo4j Team and contributors.
// https://github.com/neo4j-contrib/CodeMirror
@@ -20,8 +20,12 @@
CodeMirror.defineMode("cypher", function(config) {
var tokenBase = function(stream/*, state*/) {
var ch = stream.next();
- if (ch === "\"" || ch === "'") {
- stream.match(/.+?["']/);
+ if (ch ==='"') {
+ stream.match(/.*?"/);
+ return "string";
+ }
+ if (ch === "'") {
+ stream.match(/.*?'/);
return "string";
}
if (/[{}\(\),\.;\[\]]/.test(ch)) {
@@ -62,7 +66,7 @@
var curPunc;
var funcs = wordRegexp(["abs", "acos", "allShortestPaths", "asin", "atan", "atan2", "avg", "ceil", "coalesce", "collect", "cos", "cot", "count", "degrees", "e", "endnode", "exp", "extract", "filter", "floor", "haversin", "head", "id", "keys", "labels", "last", "left", "length", "log", "log10", "lower", "ltrim", "max", "min", "node", "nodes", "percentileCont", "percentileDisc", "pi", "radians", "rand", "range", "reduce", "rel", "relationship", "relationships", "replace", "reverse", "right", "round", "rtrim", "shortestPath", "sign", "sin", "size", "split", "sqrt", "startnode", "stdev", "stdevp", "str", "substring", "sum", "tail", "tan", "timestamp", "toFloat", "toInt", "toString", "trim", "type", "upper"]);
var preds = wordRegexp(["all", "and", "any", "contains", "exists", "has", "in", "none", "not", "or", "single", "xor"]);
- var keywords = wordRegexp(["as", "asc", "ascending", "assert", "by", "case", "commit", "constraint", "create", "csv", "cypher", "delete", "desc", "descending", "detach", "distinct", "drop", "else", "end", "ends", "explain", "false", "fieldterminator", "foreach", "from", "headers", "in", "index", "is", "join", "limit", "load", "match", "merge", "null", "on", "optional", "order", "periodic", "profile", "remove", "return", "scan", "set", "skip", "start", "starts", "then", "true", "union", "unique", "unwind", "using", "when", "where", "with"]);
+ var keywords = wordRegexp(["as", "asc", "ascending", "assert", "by", "case", "commit", "constraint", "create", "csv", "cypher", "delete", "desc", "descending", "detach", "distinct", "drop", "else", "end", "ends", "explain", "false", "fieldterminator", "foreach", "from", "headers", "in", "index", "is", "join", "limit", "load", "match", "merge", "null", "on", "optional", "order", "periodic", "profile", "remove", "return", "scan", "set", "skip", "start", "starts", "then", "true", "union", "unique", "unwind", "using", "when", "where", "with", "call", "yield"]);
var operatorChars = /[*+\-<>=&|~%^]/;
return {
diff --git a/public/vendor/plugins/codemirror/mode/cypher/index.html b/public/vendor/plugins/codemirror/mode/cypher/index.html
index b8bd75c8b3..0db7a6a7c6 100644
--- a/public/vendor/plugins/codemirror/mode/cypher/index.html
+++ b/public/vendor/plugins/codemirror/mode/cypher/index.html
@@ -7,6 +7,7 @@
+
-
CodeMirror
+ CodeMirror
- Home
@@ -53,7 +54,7 @@ window.onload = function() {
indentWithTabs: true,
smartIndent: true,
lineNumbers: true,
- matchBrackets : true,
+ matchBrackets: true,
autofocus: true,
theme: 'neo'
});
diff --git a/public/vendor/plugins/codemirror/mode/cypher/test.js b/public/vendor/plugins/codemirror/mode/cypher/test.js
new file mode 100644
index 0000000000..691835596f
--- /dev/null
+++ b/public/vendor/plugins/codemirror/mode/cypher/test.js
@@ -0,0 +1,37 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function() {
+ var mode = CodeMirror.getMode({tabSize: 4, indentUnit: 2}, "cypher");
+ function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+ MT("unbalancedDoubledQuotedString",
+ "[string \"a'b\"][variable c]");
+
+ MT("unbalancedSingleQuotedString",
+ "[string 'a\"b'][variable c]");
+
+ MT("doubleQuotedString",
+ "[string \"a\"][variable b]");
+
+ MT("singleQuotedString",
+ "[string 'a'][variable b]");
+
+ MT("single attribute (with content)",
+ "[node {][atom a:][string 'a'][node }]");
+
+ MT("multiple attribute, singleQuotedString (with content)",
+ "[node {][atom a:][string 'a'][node ,][atom b:][string 'b'][node }]");
+
+ MT("multiple attribute, doubleQuotedString (with content)",
+ "[node {][atom a:][string \"a\"][node ,][atom b:][string \"b\"][node }]");
+
+ MT("single attribute (without content)",
+ "[node {][atom a:][string 'a'][node }]");
+
+ MT("multiple attribute, singleQuotedString (without content)",
+ "[node {][atom a:][string ''][node ,][atom b:][string ''][node }]");
+
+ MT("multiple attribute, doubleQuotedString (without content)",
+ "[node {][atom a:][string \"\"][node ,][atom b:][string \"\"][node }]");
+ })();
diff --git a/public/vendor/plugins/codemirror/mode/d/d.js b/public/vendor/plugins/codemirror/mode/d/d.js
index c927a7e358..efab570633 100644
--- a/public/vendor/plugins/codemirror/mode/d/d.js
+++ b/public/vendor/plugins/codemirror/mode/d/d.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -44,7 +44,7 @@ CodeMirror.defineMode("d", function(config, parserConfig) {
}
if (ch == "/") {
if (stream.eat("+")) {
- state.tokenize = tokenComment;
+ state.tokenize = tokenNestedComment;
return tokenNestedComment(stream, state);
}
if (stream.eat("*")) {
@@ -182,7 +182,12 @@ CodeMirror.defineMode("d", function(config, parserConfig) {
else return ctx.indented + (closing ? 0 : indentUnit);
},
- electricChars: "{}"
+ electricChars: "{}",
+ blockCommentStart: "/*",
+ blockCommentEnd: "*/",
+ blockCommentContinue: " * ",
+ lineComment: "//",
+ fold: "brace"
};
});
diff --git a/public/vendor/plugins/codemirror/mode/d/index.html b/public/vendor/plugins/codemirror/mode/d/index.html
index 08cabd8a2e..95437e5e7d 100644
--- a/public/vendor/plugins/codemirror/mode/d/index.html
+++ b/public/vendor/plugins/codemirror/mode/d/index.html
@@ -10,7 +10,7 @@
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/d/test.js b/public/vendor/plugins/codemirror/mode/d/test.js
new file mode 100644
index 0000000000..f8ac9de1c8
--- /dev/null
+++ b/public/vendor/plugins/codemirror/mode/d/test.js
@@ -0,0 +1,11 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function() {
+ var mode = CodeMirror.getMode({indentUnit: 2}, "d");
+ function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+ MT("nested_comments",
+ "[comment /+]","[comment comment]","[comment +/]","[variable void] [variable main](){}");
+
+})();
diff --git a/public/vendor/plugins/codemirror/mode/dart/dart.js b/public/vendor/plugins/codemirror/mode/dart/dart.js
index 8d383a95ef..7b154c65c0 100644
--- a/public/vendor/plugins/codemirror/mode/dart/dart.js
+++ b/public/vendor/plugins/codemirror/mode/dart/dart.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -12,8 +12,8 @@
"use strict";
var keywords = ("this super static final const abstract class extends external factory " +
- "implements get native operator set typedef with enum throw rethrow " +
- "assert break case continue default in return new deferred async await " +
+ "implements mixin get native set typedef with enum throw rethrow " +
+ "assert break case continue default in return new deferred async await covariant " +
"try catch finally do else for if switch while import library export " +
"part of show hide is as").split(" ");
var blockKeywords = "try catch finally do else for if switch while".split(" ");
@@ -78,6 +78,15 @@
if (!stream.eat("*")) return false
state.tokenize = tokenNestedComment(1)
return state.tokenize(stream, state)
+ },
+ token: function(stream, _, style) {
+ if (style == "variable") {
+ // Assume uppercase symbols are classes using variable-2
+ var isUpper = RegExp('^[_$]*[A-Z][a-zA-Z0-9_$]*$','g');
+ if (isUpper.test(stream.current())) {
+ return 'variable-2';
+ }
+ }
}
}
});
diff --git a/public/vendor/plugins/codemirror/mode/dart/index.html b/public/vendor/plugins/codemirror/mode/dart/index.html
index e79da5a8b0..b68a4c5939 100644
--- a/public/vendor/plugins/codemirror/mode/dart/index.html
+++ b/public/vendor/plugins/codemirror/mode/dart/index.html
@@ -9,7 +9,7 @@
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/diff/diff.js b/public/vendor/plugins/codemirror/mode/diff/diff.js
index fe0305e7b6..a30fd37a50 100644
--- a/public/vendor/plugins/codemirror/mode/diff/diff.js
+++ b/public/vendor/plugins/codemirror/mode/diff/diff.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/public/vendor/plugins/codemirror/mode/diff/index.html b/public/vendor/plugins/codemirror/mode/diff/index.html
index 0af611fa48..5c7ef7dee0 100644
--- a/public/vendor/plugins/codemirror/mode/diff/index.html
+++ b/public/vendor/plugins/codemirror/mode/diff/index.html
@@ -15,7 +15,7 @@
span.cm-error.cm-tag { background-color: #2b2; }
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/django/django.js b/public/vendor/plugins/codemirror/mode/django/django.js
index 7b4ef3b566..07be123986 100644
--- a/public/vendor/plugins/codemirror/mode/django/django.js
+++ b/public/vendor/plugins/codemirror/mode/django/django.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/public/vendor/plugins/codemirror/mode/django/index.html b/public/vendor/plugins/codemirror/mode/django/index.html
index 41ea07c91b..384e0067be 100644
--- a/public/vendor/plugins/codemirror/mode/django/index.html
+++ b/public/vendor/plugins/codemirror/mode/django/index.html
@@ -11,9 +11,9 @@
-
+
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/dockerfile/dockerfile.js b/public/vendor/plugins/codemirror/mode/dockerfile/dockerfile.js
index 4419009afa..983170f519 100644
--- a/public/vendor/plugins/codemirror/mode/dockerfile/dockerfile.js
+++ b/public/vendor/plugins/codemirror/mode/dockerfile/dockerfile.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -11,30 +11,64 @@
})(function(CodeMirror) {
"use strict";
+ var from = "from";
+ var fromRegex = new RegExp("^(\\s*)\\b(" + from + ")\\b", "i");
+
+ var shells = ["run", "cmd", "entrypoint", "shell"];
+ var shellsAsArrayRegex = new RegExp("^(\\s*)(" + shells.join('|') + ")(\\s+\\[)", "i");
+
+ var expose = "expose";
+ var exposeRegex = new RegExp("^(\\s*)(" + expose + ")(\\s+)", "i");
+
+ var others = [
+ "arg", "from", "maintainer", "label", "env",
+ "add", "copy", "volume", "user",
+ "workdir", "onbuild", "stopsignal", "healthcheck", "shell"
+ ];
+
// Collect all Dockerfile directives
- var instructions = ["from", "maintainer", "run", "cmd", "expose", "env",
- "add", "copy", "entrypoint", "volume", "user",
- "workdir", "onbuild"],
+ var instructions = [from, expose].concat(shells).concat(others),
instructionRegex = "(" + instructions.join('|') + ")",
- instructionOnlyLine = new RegExp(instructionRegex + "\\s*$", "i"),
- instructionWithArguments = new RegExp(instructionRegex + "(\\s+)", "i");
+ instructionOnlyLine = new RegExp("^(\\s*)" + instructionRegex + "(\\s*)(#.*)?$", "i"),
+ instructionWithArguments = new RegExp("^(\\s*)" + instructionRegex + "(\\s+)", "i");
CodeMirror.defineSimpleMode("dockerfile", {
start: [
// Block comment: This is a line starting with a comment
{
- regex: /#.*$/,
+ regex: /^\s*#.*$/,
+ sol: true,
token: "comment"
},
+ {
+ regex: fromRegex,
+ token: [null, "keyword"],
+ sol: true,
+ next: "from"
+ },
// Highlight an instruction without any arguments (for convenience)
{
regex: instructionOnlyLine,
- token: "variable-2"
+ token: [null, "keyword", null, "error"],
+ sol: true
+ },
+ {
+ regex: shellsAsArrayRegex,
+ token: [null, "keyword", null],
+ sol: true,
+ next: "array"
+ },
+ {
+ regex: exposeRegex,
+ token: [null, "keyword", null],
+ sol: true,
+ next: "expose"
},
// Highlight an instruction followed by arguments
{
regex: instructionWithArguments,
- token: ["variable-2", null],
+ token: [null, "keyword", null],
+ sol: true,
next: "arguments"
},
{
@@ -42,26 +76,21 @@
token: null
}
],
- arguments: [
+ from: [
+ {
+ regex: /\s*$/,
+ token: null,
+ next: "start"
+ },
{
// Line comment without instruction arguments is an error
- regex: /#.*$/,
- token: "error",
+ regex: /(\s*)(#.*)$/,
+ token: [null, "error"],
next: "start"
},
{
- regex: /[^#]+\\$/,
- token: null
- },
- {
- // Match everything except for the inline comment
- regex: /[^#]+/,
- token: null,
- next: "start"
- },
- {
- regex: /$/,
- token: null,
+ regex: /(\s*\S+\s+)(as)/i,
+ token: [null, "keyword"],
next: "start"
},
// Fail safe return to start
@@ -70,9 +99,112 @@
next: "start"
}
],
- meta: {
- lineComment: "#"
+ single: [
+ {
+ regex: /(?:[^\\']|\\.)/,
+ token: "string"
+ },
+ {
+ regex: /'/,
+ token: "string",
+ pop: true
}
+ ],
+ double: [
+ {
+ regex: /(?:[^\\"]|\\.)/,
+ token: "string"
+ },
+ {
+ regex: /"/,
+ token: "string",
+ pop: true
+ }
+ ],
+ array: [
+ {
+ regex: /\]/,
+ token: null,
+ next: "start"
+ },
+ {
+ regex: /"(?:[^\\"]|\\.)*"?/,
+ token: "string"
+ }
+ ],
+ expose: [
+ {
+ regex: /\d+$/,
+ token: "number",
+ next: "start"
+ },
+ {
+ regex: /[^\d]+$/,
+ token: null,
+ next: "start"
+ },
+ {
+ regex: /\d+/,
+ token: "number"
+ },
+ {
+ regex: /[^\d]+/,
+ token: null
+ },
+ // Fail safe return to start
+ {
+ token: null,
+ next: "start"
+ }
+ ],
+ arguments: [
+ {
+ regex: /^\s*#.*$/,
+ sol: true,
+ token: "comment"
+ },
+ {
+ regex: /"(?:[^\\"]|\\.)*"?$/,
+ token: "string",
+ next: "start"
+ },
+ {
+ regex: /"/,
+ token: "string",
+ push: "double"
+ },
+ {
+ regex: /'(?:[^\\']|\\.)*'?$/,
+ token: "string",
+ next: "start"
+ },
+ {
+ regex: /'/,
+ token: "string",
+ push: "single"
+ },
+ {
+ regex: /[^#"']+[\\`]$/,
+ token: null
+ },
+ {
+ regex: /[^#"']+$/,
+ token: null,
+ next: "start"
+ },
+ {
+ regex: /[^#"']+/,
+ token: null
+ },
+ // Fail safe return to start
+ {
+ token: null,
+ next: "start"
+ }
+ ],
+ meta: {
+ lineComment: "#"
+ }
});
CodeMirror.defineMIME("text/x-dockerfile", "dockerfile");
diff --git a/public/vendor/plugins/codemirror/mode/dockerfile/index.html b/public/vendor/plugins/codemirror/mode/dockerfile/index.html
index a31759bce1..63bb91e6ec 100644
--- a/public/vendor/plugins/codemirror/mode/dockerfile/index.html
+++ b/public/vendor/plugins/codemirror/mode/dockerfile/index.html
@@ -8,9 +8,9 @@
-
+
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/dockerfile/test.js b/public/vendor/plugins/codemirror/mode/dockerfile/test.js
new file mode 100644
index 0000000000..51add3ce9c
--- /dev/null
+++ b/public/vendor/plugins/codemirror/mode/dockerfile/test.js
@@ -0,0 +1,128 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function() {
+ var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-dockerfile");
+ function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+ MT("simple_nodejs_dockerfile",
+ "[keyword FROM] node:carbon",
+ "[comment # Create app directory]",
+ "[keyword WORKDIR] /usr/src/app",
+ "[comment # Install app dependencies]",
+ "[comment # A wildcard is used to ensure both package.json AND package-lock.json are copied]",
+ "[comment # where available (npm@5+)]",
+ "[keyword COPY] package*.json ./",
+ "[keyword RUN] npm install",
+ "[keyword COPY] . .",
+ "[keyword EXPOSE] [number 8080] [number 3000]",
+ "[keyword ENV] NODE_ENV development",
+ "[keyword CMD] [[ [string \"npm\"], [string \"start\"] ]]");
+
+ // Ideally the last space should not be highlighted.
+ MT("instruction_without_args_1",
+ "[keyword CMD] ");
+
+ MT("instruction_without_args_2",
+ "[comment # An instruction without args...]",
+ "[keyword ARG] [error #...is an error]");
+
+ MT("multiline",
+ "[keyword RUN] apt-get update && apt-get install -y \\",
+ " mercurial \\",
+ " subversion \\",
+ " && apt-get clean \\",
+ " && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*");
+
+ MT("from_comment",
+ " [keyword FROM] debian:stretch # I tend to use stable as that is more stable",
+ " [keyword FROM] debian:stretch [keyword AS] stable # I am even more stable",
+ " [keyword FROM] [error # this is an error]");
+
+ MT("from_as",
+ "[keyword FROM] golang:1.9.2-alpine3.6 [keyword AS] build",
+ "[keyword COPY] --from=build /bin/project /bin/project",
+ "[keyword ENTRYPOINT] [[ [string \"/bin/project\"] ]]",
+ "[keyword CMD] [[ [string \"--help\"] ]]");
+
+ MT("arg",
+ "[keyword ARG] VERSION=latest",
+ "[keyword FROM] busybox:$VERSION",
+ "[keyword ARG] VERSION",
+ "[keyword RUN] echo $VERSION > image_version");
+
+ MT("label",
+ "[keyword LABEL] com.example.label-with-value=[string \"foo\"]");
+
+ MT("label_multiline",
+ "[keyword LABEL] description=[string \"This text illustrates ]\\",
+ "[string that label-values can span multiple lines.\"]");
+
+ MT("maintainer",
+ "[keyword MAINTAINER] Foo Bar [string \"foo@bar.com\"] ",
+ "[keyword MAINTAINER] Bar Baz -
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/dylan/dylan.js b/public/vendor/plugins/codemirror/mode/dylan/dylan.js
index 1b46bc8284..6725edccc0 100644
--- a/public/vendor/plugins/codemirror/mode/dylan/dylan.js
+++ b/public/vendor/plugins/codemirror/mode/dylan/dylan.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -11,6 +11,14 @@
})(function(CodeMirror) {
"use strict";
+function forEach(arr, f) {
+ for (var i = 0; i < arr.length; i++) f(arr[i], i)
+}
+function some(arr, f) {
+ for (var i = 0; i < arr.length; i++) if (f(arr[i], i)) return true
+ return false
+}
+
CodeMirror.defineMode("dylan", function(_config) {
// Words
var words = {
@@ -136,13 +144,13 @@ CodeMirror.defineMode("dylan", function(_config) {
var wordLookup = {};
var styleLookup = {};
- [
+ forEach([
"keyword",
"definition",
"simpleDefinition",
"signalingCalls"
- ].forEach(function(type) {
- words[type].forEach(function(word) {
+ ], function(type) {
+ forEach(words[type], function(word) {
wordLookup[word] = type;
styleLookup[word] = styles[type];
});
@@ -258,7 +266,7 @@ CodeMirror.defineMode("dylan", function(_config) {
for (var name in patterns) {
if (patterns.hasOwnProperty(name)) {
var pattern = patterns[name];
- if ((pattern instanceof Array && pattern.some(function(p) {
+ if ((pattern instanceof Array && some(pattern, function(p) {
return stream.match(p);
})) || stream.match(pattern))
return patternStyles[name];
@@ -273,7 +281,7 @@ CodeMirror.defineMode("dylan", function(_config) {
} else {
stream.eatWhile(/[\w\-]/);
// Keyword
- if (wordLookup[stream.current()]) {
+ if (wordLookup.hasOwnProperty(stream.current())) {
return styleLookup[stream.current()];
} else if (stream.current().match(symbol)) {
return "variable";
diff --git a/public/vendor/plugins/codemirror/mode/dylan/index.html b/public/vendor/plugins/codemirror/mode/dylan/index.html
index ddf5ad067d..af259528cb 100644
--- a/public/vendor/plugins/codemirror/mode/dylan/index.html
+++ b/public/vendor/plugins/codemirror/mode/dylan/index.html
@@ -10,9 +10,9 @@
-
+
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/dylan/test.js b/public/vendor/plugins/codemirror/mode/dylan/test.js
index bf25be27e1..8b121b9133 100644
--- a/public/vendor/plugins/codemirror/mode/dylan/test.js
+++ b/public/vendor/plugins/codemirror/mode/dylan/test.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function() {
var mode = CodeMirror.getMode({indentUnit: 2}, "dylan");
diff --git a/public/vendor/plugins/codemirror/mode/ebnf/ebnf.js b/public/vendor/plugins/codemirror/mode/ebnf/ebnf.js
index 9618f8e42b..238bbe23bf 100644
--- a/public/vendor/plugins/codemirror/mode/ebnf/ebnf.js
+++ b/public/vendor/plugins/codemirror/mode/ebnf/ebnf.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/public/vendor/plugins/codemirror/mode/ebnf/index.html b/public/vendor/plugins/codemirror/mode/ebnf/index.html
index 13845629b3..9bd28a4adf 100644
--- a/public/vendor/plugins/codemirror/mode/ebnf/index.html
+++ b/public/vendor/plugins/codemirror/mode/ebnf/index.html
@@ -9,11 +9,11 @@
-
+
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/ecl/ecl.js b/public/vendor/plugins/codemirror/mode/ecl/ecl.js
index 8df7ebe4ab..9af8aee180 100644
--- a/public/vendor/plugins/codemirror/mode/ecl/ecl.js
+++ b/public/vendor/plugins/codemirror/mode/ecl/ecl.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/public/vendor/plugins/codemirror/mode/ecl/index.html b/public/vendor/plugins/codemirror/mode/ecl/index.html
index 2306860dcb..1acaec332f 100644
--- a/public/vendor/plugins/codemirror/mode/ecl/index.html
+++ b/public/vendor/plugins/codemirror/mode/ecl/index.html
@@ -9,7 +9,7 @@
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/eiffel/eiffel.js b/public/vendor/plugins/codemirror/mode/eiffel/eiffel.js
index b8b70e36e5..f6f3f458b6 100644
--- a/public/vendor/plugins/codemirror/mode/eiffel/eiffel.js
+++ b/public/vendor/plugins/codemirror/mode/eiffel/eiffel.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/public/vendor/plugins/codemirror/mode/eiffel/index.html b/public/vendor/plugins/codemirror/mode/eiffel/index.html
index 108a71bec8..568fbb79bb 100644
--- a/public/vendor/plugins/codemirror/mode/eiffel/index.html
+++ b/public/vendor/plugins/codemirror/mode/eiffel/index.html
@@ -13,7 +13,7 @@
.cm-s-default span.cm-arrow { color: red; }
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/elm/elm.js b/public/vendor/plugins/codemirror/mode/elm/elm.js
index b31e663757..fe8dd497f4 100644
--- a/public/vendor/plugins/codemirror/mode/elm/elm.js
+++ b/public/vendor/plugins/codemirror/mode/elm/elm.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -70,7 +70,7 @@
if (smallRE.test(ch)) {
var isDef = source.pos === 1;
source.eatWhile(idRE);
- return isDef ? "variable-3" : "variable";
+ return isDef ? "type" : "variable";
}
if (digitRE.test(ch)) {
diff --git a/public/vendor/plugins/codemirror/mode/elm/index.html b/public/vendor/plugins/codemirror/mode/elm/index.html
index d5cb16abfb..9bef08a8e3 100644
--- a/public/vendor/plugins/codemirror/mode/elm/index.html
+++ b/public/vendor/plugins/codemirror/mode/elm/index.html
@@ -7,9 +7,9 @@
-
+
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/erlang/erlang.js b/public/vendor/plugins/codemirror/mode/erlang/erlang.js
index 5aed76a526..f0541bb955 100644
--- a/public/vendor/plugins/codemirror/mode/erlang/erlang.js
+++ b/public/vendor/plugins/codemirror/mode/erlang/erlang.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
/*jshint unused:true, eqnull:true, curly:true, bitwise:true */
/*jshint undef:true, latedef:true, trailing:true */
@@ -433,15 +433,16 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
}
function maybe_drop_post(s) {
+ if (!s.length) return s
var last = s.length-1;
if (s[last].type === "dot") {
return [];
}
- if (s[last].type === "fun" && s[last-1].token === "fun") {
+ if (last > 1 && s[last].type === "fun" && s[last-1].token === "fun") {
return s.slice(0,last-1);
}
- switch (s[s.length-1].token) {
+ switch (s[last].token) {
case "}": return d(s,{g:["{"]});
case "]": return d(s,{i:["["]});
case ")": return d(s,{i:["("]});
diff --git a/public/vendor/plugins/codemirror/mode/erlang/index.html b/public/vendor/plugins/codemirror/mode/erlang/index.html
index 6d06a890a2..5f54c0fe98 100644
--- a/public/vendor/plugins/codemirror/mode/erlang/index.html
+++ b/public/vendor/plugins/codemirror/mode/erlang/index.html
@@ -9,9 +9,9 @@
-
+
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/factor/factor.js b/public/vendor/plugins/codemirror/mode/factor/factor.js
index 86d7adf627..7108278cca 100644
--- a/public/vendor/plugins/codemirror/mode/factor/factor.js
+++ b/public/vendor/plugins/codemirror/mode/factor/factor.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
// Factor syntax highlight - simple mode
//
@@ -22,52 +22,54 @@
{regex: /#?!.*/, token: "comment"},
// strings """, multiline --> state
{regex: /"""/, token: "string", next: "string3"},
- {regex: /"/, token: "string", next: "string"},
+ {regex: /(STRING:)(\s)/, token: ["keyword", null], next: "string2"},
+ {regex: /\S*?"/, token: "string", next: "string"},
// numbers: dec, hex, unicode, bin, fractional, complex
- {regex: /(?:[+-]?)(?:0x[\d,a-f]+)|(?:0o[0-7]+)|(?:0b[0,1]+)|(?:\d+.?\d*)/, token: "number"},
+ {regex: /(?:0x[\d,a-f]+)|(?:0o[0-7]+)|(?:0b[0,1]+)|(?:\-?\d+.?\d*)(?=\s)/, token: "number"},
//{regex: /[+-]?/} //fractional
// definition: defining word, defined word, etc
- {regex: /(\:)(\s+)(\S+)(\s+)(\()/, token: ["keyword", null, "def", null, "keyword"], next: "stack"},
+ {regex: /((?:GENERIC)|\:?\:)(\s+)(\S+)(\s+)(\()/, token: ["keyword", null, "def", null, "bracket"], next: "stack"},
+ // method definition: defining word, type, defined word, etc
+ {regex: /(M\:)(\s+)(\S+)(\s+)(\S+)/, token: ["keyword", null, "def", null, "tag"]},
// vocabulary using --> state
{regex: /USING\:/, token: "keyword", next: "vocabulary"},
// vocabulary definition/use
- {regex: /(USE\:|IN\:)(\s+)(\S+)/, token: ["keyword", null, "variable-2"]},
- //
- {regex: /<\S+>/, token: "builtin"}, + {regex: /(USE\:|IN\:)(\s+)(\S+)(?=\s|$)/, token: ["keyword", null, "tag"]}, + // definition: a defining word, defined word + {regex: /(\S+\:)(\s+)(\S+)(?=\s|$)/, token: ["keyword", null, "def"]}, // "keywords", incl. ; t f . [ ] { } defining words - {regex: /;|t|f|if|\.|\[|\]|\{|\}|MAIN:/, token: "keyword"}, + {regex: /(?:;|\\|t|f|if|loop|while|until|do|PRIVATE>| -CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/fcl/fcl.js b/public/vendor/plugins/codemirror/mode/fcl/fcl.js
index 518116976a..2d3f2001d3 100644
--- a/public/vendor/plugins/codemirror/mode/fcl/fcl.js
+++ b/public/vendor/plugins/codemirror/mode/fcl/fcl.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/public/vendor/plugins/codemirror/mode/fcl/index.html b/public/vendor/plugins/codemirror/mode/fcl/index.html
index 3c18d0b3c7..7ea0fd15f8 100644
--- a/public/vendor/plugins/codemirror/mode/fcl/index.html
+++ b/public/vendor/plugins/codemirror/mode/fcl/index.html
@@ -11,7 +11,7 @@
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/forth/forth.js b/public/vendor/plugins/codemirror/mode/forth/forth.js
index 1f519d8862..f2caa27af8 100644
--- a/public/vendor/plugins/codemirror/mode/forth/forth.js
+++ b/public/vendor/plugins/codemirror/mode/forth/forth.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
// Author: Aliaksei Chapyzhenka
diff --git a/public/vendor/plugins/codemirror/mode/forth/index.html b/public/vendor/plugins/codemirror/mode/forth/index.html
index ae8cd34584..470363f48f 100644
--- a/public/vendor/plugins/codemirror/mode/forth/index.html
+++ b/public/vendor/plugins/codemirror/mode/forth/index.html
@@ -16,7 +16,7 @@
}
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/fortran/fortran.js b/public/vendor/plugins/codemirror/mode/fortran/fortran.js
index 4d88f006aa..85bacc42c1 100644
--- a/public/vendor/plugins/codemirror/mode/fortran/fortran.js
+++ b/public/vendor/plugins/codemirror/mode/fortran/fortran.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/public/vendor/plugins/codemirror/mode/fortran/index.html b/public/vendor/plugins/codemirror/mode/fortran/index.html
index 9aed0efccc..a799e937f1 100644
--- a/public/vendor/plugins/codemirror/mode/fortran/index.html
+++ b/public/vendor/plugins/codemirror/mode/fortran/index.html
@@ -7,9 +7,9 @@
-
+
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/gas/gas.js b/public/vendor/plugins/codemirror/mode/gas/gas.js
index 0c74bedc57..e34d7a7b61 100644
--- a/public/vendor/plugins/codemirror/mode/gas/gas.js
+++ b/public/vendor/plugins/codemirror/mode/gas/gas.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/public/vendor/plugins/codemirror/mode/gas/index.html b/public/vendor/plugins/codemirror/mode/gas/index.html
index df75ca2db7..34eea72da4 100644
--- a/public/vendor/plugins/codemirror/mode/gas/index.html
+++ b/public/vendor/plugins/codemirror/mode/gas/index.html
@@ -9,7 +9,7 @@
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/gfm/gfm.js b/public/vendor/plugins/codemirror/mode/gfm/gfm.js
index 6e74ad4fd6..492c9487a6 100644
--- a/public/vendor/plugins/codemirror/mode/gfm/gfm.js
+++ b/public/vendor/plugins/codemirror/mode/gfm/gfm.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -81,7 +81,7 @@ CodeMirror.defineMode("gfm", function(config, modeConfig) {
if (stream.sol() || state.ateSpace) {
state.ateSpace = false;
if (modeConfig.gitHubSpice !== false) {
- if(stream.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+@)?(?:[a-f0-9]{7,40}\b)/)) {
+ if(stream.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+@)?(?=.{0,6}\d)(?:[a-f0-9]{7,40}\b)/)) {
// User/Project@SHA
// User@SHA
// SHA
@@ -113,10 +113,9 @@ CodeMirror.defineMode("gfm", function(config, modeConfig) {
};
var markdownConfig = {
- underscoresBreakWords: false,
taskLists: true,
- fencedCodeBlocks: '```',
- strikethrough: true
+ strikethrough: true,
+ emoji: true
};
for (var attr in modeConfig) {
markdownConfig[attr] = modeConfig[attr];
diff --git a/public/vendor/plugins/codemirror/mode/gfm/index.html b/public/vendor/plugins/codemirror/mode/gfm/index.html
index 24c90c068e..8f6fb8ea80 100644
--- a/public/vendor/plugins/codemirror/mode/gfm/index.html
+++ b/public/vendor/plugins/codemirror/mode/gfm/index.html
@@ -15,9 +15,12 @@
-
+
-
CodeMirror
+ CodeMirror
- Home
@@ -67,6 +70,10 @@ for (var i = 0; i < items.length; i++) {
## A bit of GitHub spice
+See http://github.github.com/github-flavored-markdown/.
+
+(Set `gitHubSpice: false` in mode options to disable):
+
* SHA: be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2
* User@SHA ref: mojombo@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2
* User/Project@SHA: mojombo/god@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2
@@ -74,13 +81,21 @@ for (var i = 0; i < items.length; i++) {
* User/#Num: mojombo#1
* User/Project#Num: mojombo/god#1
-See http://github.github.com/github-flavored-markdown/.
+(Set `emoji: false` in mode options to disable):
+
+* emoji: :smile:
+
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/go/go.js b/public/vendor/plugins/codemirror/mode/go/go.js
index 3c9ef6b989..c005e42ddc 100644
--- a/public/vendor/plugins/codemirror/mode/go/go.js
+++ b/public/vendor/plugins/codemirror/mode/go/go.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -23,12 +23,13 @@ CodeMirror.defineMode("go", function(config) {
"bool":true, "byte":true, "complex64":true, "complex128":true,
"float32":true, "float64":true, "int8":true, "int16":true, "int32":true,
"int64":true, "string":true, "uint8":true, "uint16":true, "uint32":true,
- "uint64":true, "int":true, "uint":true, "uintptr":true, "error": true
+ "uint64":true, "int":true, "uint":true, "uintptr":true, "error": true,
+ "rune":true
};
var atoms = {
"true":true, "false":true, "iota":true, "nil":true, "append":true,
- "cap":true, "close":true, "complex":true, "copy":true, "imag":true,
+ "cap":true, "close":true, "complex":true, "copy":true, "delete":true, "imag":true,
"len":true, "make":true, "new":true, "panic":true, "print":true,
"println":true, "real":true, "recover":true
};
@@ -154,14 +155,14 @@ CodeMirror.defineMode("go", function(config) {
else if (curPunc == "[") pushContext(state, stream.column(), "]");
else if (curPunc == "(") pushContext(state, stream.column(), ")");
else if (curPunc == "case") ctx.type = "case";
- else if (curPunc == "}" && ctx.type == "}") ctx = popContext(state);
+ else if (curPunc == "}" && ctx.type == "}") popContext(state);
else if (curPunc == ctx.type) popContext(state);
state.startOfLine = false;
return style;
},
indent: function(state, textAfter) {
- if (state.tokenize != tokenBase && state.tokenize != null) return 0;
+ if (state.tokenize != tokenBase && state.tokenize != null) return CodeMirror.Pass;
var ctx = state.context, firstChar = textAfter && textAfter.charAt(0);
if (ctx.type == "case" && /^(?:case|default)\b/.test(textAfter)) {
state.context.type = "}";
@@ -173,6 +174,7 @@ CodeMirror.defineMode("go", function(config) {
},
electricChars: "{}):",
+ closeBrackets: "()[]{}''\"\"``",
fold: "brace",
blockCommentStart: "/*",
blockCommentEnd: "*/",
diff --git a/public/vendor/plugins/codemirror/mode/go/index.html b/public/vendor/plugins/codemirror/mode/go/index.html
index 72e3b364c6..4489211043 100644
--- a/public/vendor/plugins/codemirror/mode/go/index.html
+++ b/public/vendor/plugins/codemirror/mode/go/index.html
@@ -11,7 +11,7 @@
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/groovy/groovy.js b/public/vendor/plugins/codemirror/mode/groovy/groovy.js
index 721933b01c..2b90d01c43 100644
--- a/public/vendor/plugins/codemirror/mode/groovy/groovy.js
+++ b/public/vendor/plugins/codemirror/mode/groovy/groovy.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -21,9 +21,9 @@ CodeMirror.defineMode("groovy", function(config) {
"abstract as assert boolean break byte case catch char class const continue def default " +
"do double else enum extends final finally float for goto if implements import in " +
"instanceof int interface long native new package private protected public return " +
- "short static strictfp super switch synchronized threadsafe throw throws transient " +
+ "short static strictfp super switch synchronized threadsafe throw throws trait transient " +
"try void volatile while");
- var blockKeywords = words("catch class do else finally for if switch try while enum interface def");
+ var blockKeywords = words("catch class def do else enum finally for if interface switch trait try while");
var standaloneKeywords = words("return break continue");
var atoms = words("null true false this");
@@ -210,7 +210,7 @@ CodeMirror.defineMode("groovy", function(config) {
},
indent: function(state, textAfter) {
- if (!state.tokenize[state.tokenize.length-1].isBase) return 0;
+ if (!state.tokenize[state.tokenize.length-1].isBase) return CodeMirror.Pass;
var firstChar = textAfter && textAfter.charAt(0), ctx = state.context;
if (ctx.type == "statement" && !expectExpression(state.lastToken, true)) ctx = ctx.prev;
var closing = firstChar == ctx.type;
@@ -221,7 +221,10 @@ CodeMirror.defineMode("groovy", function(config) {
electricChars: "{}",
closeBrackets: {triples: "'\""},
- fold: "brace"
+ fold: "brace",
+ blockCommentStart: "/*",
+ blockCommentEnd: "*/",
+ lineComment: "//"
};
});
diff --git a/public/vendor/plugins/codemirror/mode/groovy/index.html b/public/vendor/plugins/codemirror/mode/groovy/index.html
index bb0df078c3..3e022fdf09 100644
--- a/public/vendor/plugins/codemirror/mode/groovy/index.html
+++ b/public/vendor/plugins/codemirror/mode/groovy/index.html
@@ -10,7 +10,7 @@
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/haml/haml.js b/public/vendor/plugins/codemirror/mode/haml/haml.js
index 20ae1e19ca..3c8f505eb5 100644
--- a/public/vendor/plugins/codemirror/mode/haml/haml.js
+++ b/public/vendor/plugins/codemirror/mode/haml/haml.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/public/vendor/plugins/codemirror/mode/haml/index.html b/public/vendor/plugins/codemirror/mode/haml/index.html
index 2894a938e8..ba3ea3062c 100644
--- a/public/vendor/plugins/codemirror/mode/haml/index.html
+++ b/public/vendor/plugins/codemirror/mode/haml/index.html
@@ -13,7 +13,7 @@
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/haml/test.js b/public/vendor/plugins/codemirror/mode/haml/test.js
index 508458a437..e051452738 100644
--- a/public/vendor/plugins/codemirror/mode/haml/test.js
+++ b/public/vendor/plugins/codemirror/mode/haml/test.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function() {
var mode = CodeMirror.getMode({tabSize: 4, indentUnit: 2}, "haml");
diff --git a/public/vendor/plugins/codemirror/mode/handlebars/handlebars.js b/public/vendor/plugins/codemirror/mode/handlebars/handlebars.js
index 2174e53849..fe8b3b44e8 100644
--- a/public/vendor/plugins/codemirror/mode/handlebars/handlebars.js
+++ b/public/vendor/plugins/codemirror/mode/handlebars/handlebars.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -13,10 +13,14 @@
CodeMirror.defineSimpleMode("handlebars-tags", {
start: [
+ { regex: /\{\{\{/, push: "handlebars_raw", token: "tag" },
{ regex: /\{\{!--/, push: "dash_comment", token: "comment" },
{ regex: /\{\{!/, push: "comment", token: "comment" },
{ regex: /\{\{/, push: "handlebars", token: "tag" }
],
+ handlebars_raw: [
+ { regex: /\}\}\}/, pop: true, token: "tag" },
+ ],
handlebars: [
{ regex: /\}\}/, pop: true, token: "tag" },
@@ -46,7 +50,11 @@
comment: [
{ regex: /\}\}/, pop: true, token: "comment" },
{ regex: /./, token: "comment" }
- ]
+ ],
+ meta: {
+ blockCommentStart: "{{--",
+ blockCommentEnd: "--}}"
+ }
});
CodeMirror.defineMode("handlebars", function(config, parserConfig) {
diff --git a/public/vendor/plugins/codemirror/mode/handlebars/index.html b/public/vendor/plugins/codemirror/mode/handlebars/index.html
index b1bfad1ca3..e2da2e766f 100644
--- a/public/vendor/plugins/codemirror/mode/handlebars/index.html
+++ b/public/vendor/plugins/codemirror/mode/handlebars/index.html
@@ -8,11 +8,12 @@
+
-
CodeMirror
+ CodeMirror
- Home
@@ -40,6 +41,8 @@
{{! one line comment }}
+{{{propertyContainingRawHtml}}}
+
{{#each articles}}
{{~title}}
{{excerpt body size=120 ellipsis=true}}
diff --git a/public/vendor/plugins/codemirror/mode/haskell-literate/haskell-literate.js b/public/vendor/plugins/codemirror/mode/haskell-literate/haskell-literate.js index 906415b4c1..4bb9268491 100644 --- a/public/vendor/plugins/codemirror/mode/haskell-literate/haskell-literate.js +++ b/public/vendor/plugins/codemirror/mode/haskell-literate/haskell-literate.js @@ -1,5 +1,5 @@ // CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE +// Distributed under an MIT license: https://codemirror.net/LICENSE (function (mod) { if (typeof exports == "object" && typeof module == "object") // CommonJS diff --git a/public/vendor/plugins/codemirror/mode/haskell-literate/index.html b/public/vendor/plugins/codemirror/mode/haskell-literate/index.html index 8c9bc60d15..aa3f3ea5b1 100644 --- a/public/vendor/plugins/codemirror/mode/haskell-literate/index.html +++ b/public/vendor/plugins/codemirror/mode/haskell-literate/index.html @@ -13,7 +13,7 @@ border-bottom : 1px solid #DDDDDD; }-CodeMirror
CodeMirror
-
diff --git a/public/vendor/plugins/codemirror/mode/haskell/haskell.js b/public/vendor/plugins/codemirror/mode/haskell/haskell.js
index fe0bab67ed..2e882dc600 100644
--- a/public/vendor/plugins/codemirror/mode/haskell/haskell.js
+++ b/public/vendor/plugins/codemirror/mode/haskell/haskell.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -56,7 +56,7 @@ CodeMirror.defineMode("haskell", function(_config, modeConfig) {
if (source.eat('\'')) {
return "string";
}
- return "error";
+ return "string error";
}
if (ch == '"') {
@@ -166,7 +166,7 @@ CodeMirror.defineMode("haskell", function(_config, modeConfig) {
}
}
setState(normal);
- return "error";
+ return "string error";
}
function stringGap(source, setState) {
@@ -194,16 +194,17 @@ CodeMirror.defineMode("haskell", function(_config, modeConfig) {
"module", "newtype", "of", "then", "type", "where", "_");
setType("keyword")(
- "\.\.", ":", "::", "=", "\\", "\"", "<-", "->", "@", "~", "=>");
+ "\.\.", ":", "::", "=", "\\", "<-", "->", "@", "~", "=>");
setType("builtin")(
- "!!", "$!", "$", "&&", "+", "++", "-", ".", "/", "/=", "<", "<=", "=<<",
- "==", ">", ">=", ">>", ">>=", "^", "^^", "||", "*", "**");
+ "!!", "$!", "$", "&&", "+", "++", "-", ".", "/", "/=", "<", "<*", "<=",
+ "<$>", "<*>", "=<<", "==", ">", ">=", ">>", ">>=", "^", "^^", "||", "*",
+ "*>", "**");
setType("builtin")(
- "Bool", "Bounded", "Char", "Double", "EQ", "Either", "Enum", "Eq",
- "False", "FilePath", "Float", "Floating", "Fractional", "Functor", "GT",
- "IO", "IOError", "Int", "Integer", "Integral", "Just", "LT", "Left",
+ "Applicative", "Bool", "Bounded", "Char", "Double", "EQ", "Either", "Enum",
+ "Eq", "False", "FilePath", "Float", "Floating", "Fractional", "Functor",
+ "GT", "IO", "IOError", "Int", "Integer", "Integral", "Just", "LT", "Left",
"Maybe", "Monad", "Nothing", "Num", "Ord", "Ordering", "Rational", "Read",
"ReadS", "Real", "RealFloat", "RealFrac", "Right", "Show", "ShowS",
"String", "True");
@@ -223,7 +224,7 @@ CodeMirror.defineMode("haskell", function(_config, modeConfig) {
"lcm", "length", "lex", "lines", "log", "logBase", "lookup", "map",
"mapM", "mapM_", "max", "maxBound", "maximum", "maybe", "min", "minBound",
"minimum", "mod", "negate", "not", "notElem", "null", "odd", "or",
- "otherwise", "pi", "pred", "print", "product", "properFraction",
+ "otherwise", "pi", "pred", "print", "product", "properFraction", "pure",
"putChar", "putStr", "putStrLn", "quot", "quotRem", "read", "readFile",
"readIO", "readList", "readLn", "readParen", "reads", "readsPrec",
"realToFrac", "recip", "rem", "repeat", "replicate", "return", "reverse",
diff --git a/public/vendor/plugins/codemirror/mode/haskell/index.html b/public/vendor/plugins/codemirror/mode/haskell/index.html
index 42240b0f2f..4d56682973 100644
--- a/public/vendor/plugins/codemirror/mode/haskell/index.html
+++ b/public/vendor/plugins/codemirror/mode/haskell/index.html
@@ -9,9 +9,9 @@
-
+
- Home
diff --git a/public/vendor/plugins/codemirror/mode/haxe/haxe.js b/public/vendor/plugins/codemirror/mode/haxe/haxe.js
index a9573dd71b..45376852a6 100644
--- a/public/vendor/plugins/codemirror/mode/haxe/haxe.js
+++ b/public/vendor/plugins/codemirror/mode/haxe/haxe.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -485,7 +485,7 @@ CodeMirror.defineMode("hxml", function () {
if (state.inString == false && ch == "'") {
state.inString = true;
- ch = stream.next();
+ stream.next();
}
if (state.inString == true) {
diff --git a/public/vendor/plugins/codemirror/mode/haxe/index.html b/public/vendor/plugins/codemirror/mode/haxe/index.html
index d415b5e109..89dacdfb59 100644
--- a/public/vendor/plugins/codemirror/mode/haxe/index.html
+++ b/public/vendor/plugins/codemirror/mode/haxe/index.html
@@ -7,9 +7,9 @@
-
+
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/htmlembedded/htmlembedded.js b/public/vendor/plugins/codemirror/mode/htmlembedded/htmlembedded.js
index 464dc57f83..439e63a427 100644
--- a/public/vendor/plugins/codemirror/mode/htmlembedded/htmlembedded.js
+++ b/public/vendor/plugins/codemirror/mode/htmlembedded/htmlembedded.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -14,7 +14,16 @@
"use strict";
CodeMirror.defineMode("htmlembedded", function(config, parserConfig) {
+ var closeComment = parserConfig.closeComment || "--%>"
return CodeMirror.multiplexingMode(CodeMirror.getMode(config, "htmlmixed"), {
+ open: parserConfig.openComment || "<%--",
+ close: closeComment,
+ delimStyle: "comment",
+ mode: {token: function(stream) {
+ stream.skipTo(closeComment) || stream.skipToEnd()
+ return "comment"
+ }}
+ }, {
open: parserConfig.open || parserConfig.scriptStartRegex || "<%",
close: parserConfig.close || parserConfig.scriptEndRegex || "%>",
mode: CodeMirror.getMode(config, parserConfig.scriptingModeSpec)
diff --git a/public/vendor/plugins/codemirror/mode/htmlembedded/index.html b/public/vendor/plugins/codemirror/mode/htmlembedded/index.html
index 9ed33cffef..4257237af1 100644
--- a/public/vendor/plugins/codemirror/mode/htmlembedded/index.html
+++ b/public/vendor/plugins/codemirror/mode/htmlembedded/index.html
@@ -12,9 +12,9 @@
-
+
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/htmlmixed/htmlmixed.js b/public/vendor/plugins/codemirror/mode/htmlmixed/htmlmixed.js
index d74083ee1a..8341ac8261 100644
--- a/public/vendor/plugins/codemirror/mode/htmlmixed/htmlmixed.js
+++ b/public/vendor/plugins/codemirror/mode/htmlmixed/htmlmixed.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -14,7 +14,7 @@
var defaultTags = {
script: [
["lang", /(javascript|babel)/i, "javascript"],
- ["type", /^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^$/i, "javascript"],
+ ["type", /^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^module$|^$/i, "javascript"],
["type", /./, "text/plain"],
[null, null, "javascript"]
],
@@ -46,7 +46,7 @@
function getAttrValue(text, attr) {
var match = text.match(getAttrRegexp(attr))
- return match ? match[2] : ""
+ return match ? /^\s*(.*?)\s*$/.exec(match[2])[1] : ""
}
function getTagRegexp(tagName, anchored) {
@@ -105,7 +105,7 @@
return maybeBackup(stream, endTag, state.localMode.token(stream, state.localState));
};
state.localMode = mode;
- state.localState = CodeMirror.startState(mode, htmlMode.indent(state.htmlState, ""));
+ state.localState = CodeMirror.startState(mode, htmlMode.indent(state.htmlState, "", ""));
} else if (state.inTag) {
state.inTag += stream.current()
if (stream.eol()) state.inTag += " "
@@ -133,11 +133,11 @@
return state.token(stream, state);
},
- indent: function (state, textAfter) {
+ indent: function (state, textAfter, line) {
if (!state.localMode || /^\s*<\//.test(textAfter))
- return htmlMode.indent(state.htmlState, textAfter);
+ return htmlMode.indent(state.htmlState, textAfter, line);
else if (state.localMode.indent)
- return state.localMode.indent(state.localState, textAfter);
+ return state.localMode.indent(state.localState, textAfter, line);
else
return CodeMirror.Pass;
},
diff --git a/public/vendor/plugins/codemirror/mode/htmlmixed/index.html b/public/vendor/plugins/codemirror/mode/htmlmixed/index.html
index f94df9e21a..7de1e03503 100644
--- a/public/vendor/plugins/codemirror/mode/htmlmixed/index.html
+++ b/public/vendor/plugins/codemirror/mode/htmlmixed/index.html
@@ -14,7 +14,7 @@
-
CodeMirror
+ CodeMirror
- Home
@@ -34,7 +34,7 @@
Mixed HTML Example - +-CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/idl/idl.js b/public/vendor/plugins/codemirror/mode/idl/idl.js
index 07308d71dc..168761cd88 100644
--- a/public/vendor/plugins/codemirror/mode/idl/idl.js
+++ b/public/vendor/plugins/codemirror/mode/idl/idl.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/public/vendor/plugins/codemirror/mode/idl/index.html b/public/vendor/plugins/codemirror/mode/idl/index.html
index 4c169e2d69..6ef17d093e 100644
--- a/public/vendor/plugins/codemirror/mode/idl/index.html
+++ b/public/vendor/plugins/codemirror/mode/idl/index.html
@@ -6,10 +6,11 @@
+
-
+
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/index.html b/public/vendor/plugins/codemirror/mode/index.html
index 732e0e52cd..858ba127f2 100644
--- a/public/vendor/plugins/codemirror/mode/index.html
+++ b/public/vendor/plugins/codemirror/mode/index.html
@@ -5,7 +5,7 @@
-
CodeMirror
+ CodeMirror
- Home @@ -56,6 +56,7 @@ option.
- EBNF
- ECL
- Eiffel +
- Elixir
- Elm
- Erlang
- Factor @@ -76,11 +77,10 @@ option.
- HTTP
- IDL
- Java -
- Jade
- JavaScript (JSX)
- Jinja2
- Julia -
- Kotlin +
- Kotlin
- LESS
- LiveScript
- Lua @@ -93,7 +93,7 @@ option.
- MUMPS
- Nginx
- NSIS -
- NTriples +
- N-Triples/N-Quads
- Objective C
- OCaml
- Octave (MATLAB) @@ -107,6 +107,7 @@ option.
- PowerShell
- Properties files
- ProtoBuf +
- Pug
- Puppet
- Python
- Q diff --git a/public/vendor/plugins/codemirror/mode/javascript/index.html b/public/vendor/plugins/codemirror/mode/javascript/index.html index 592a133d85..4eff2e28bc 100644 --- a/public/vendor/plugins/codemirror/mode/javascript/index.html +++ b/public/vendor/plugins/codemirror/mode/javascript/index.html @@ -10,9 +10,9 @@ - +
- Home
diff --git a/public/vendor/plugins/codemirror/mode/javascript/javascript.js b/public/vendor/plugins/codemirror/mode/javascript/javascript.js
index 3909c85e6a..16943a9eb9 100644
--- a/public/vendor/plugins/codemirror/mode/javascript/javascript.js
+++ b/public/vendor/plugins/codemirror/mode/javascript/javascript.js
@@ -1,7 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// TODO actually recognize syntax of TypeScript constructs
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -13,11 +11,6 @@
})(function(CodeMirror) {
"use strict";
-function expressionAllowed(stream, state, backUp) {
- return /^(?:operator|sof|keyword c|case|new|[\[{}\(,;:]|=>)$/.test(state.lastType) ||
- (state.lastType == "quasi" && /\{\s*$/.test(stream.string.slice(0, stream.pos - (backUp || 0))))
-}
-
CodeMirror.defineMode("javascript", function(config, parserConfig) {
var indentUnit = config.indentUnit;
var statementIndent = parserConfig.statementIndent;
@@ -30,55 +23,24 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
var keywords = function(){
function kw(type) {return {type: type, style: "keyword"};}
- var A = kw("keyword a"), B = kw("keyword b"), C = kw("keyword c");
+ var A = kw("keyword a"), B = kw("keyword b"), C = kw("keyword c"), D = kw("keyword d");
var operator = kw("operator"), atom = {type: "atom", style: "atom"};
- var jsKeywords = {
+ return {
"if": kw("if"), "while": A, "with": A, "else": B, "do": B, "try": B, "finally": B,
- "return": C, "break": C, "continue": C, "new": kw("new"), "delete": C, "throw": C, "debugger": C,
- "var": kw("var"), "const": kw("var"), "let": kw("var"),
+ "return": D, "break": D, "continue": D, "new": kw("new"), "delete": C, "void": C, "throw": C,
+ "debugger": kw("debugger"), "var": kw("var"), "const": kw("var"), "let": kw("var"),
"function": kw("function"), "catch": kw("catch"),
"for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"),
"in": operator, "typeof": operator, "instanceof": operator,
"true": atom, "false": atom, "null": atom, "undefined": atom, "NaN": atom, "Infinity": atom,
"this": kw("this"), "class": kw("class"), "super": kw("atom"),
"yield": C, "export": kw("export"), "import": kw("import"), "extends": C,
- "await": C, "async": kw("async")
+ "await": C
};
-
- // Extend the 'normal' keywords with the TypeScript language extensions
- if (isTS) {
- var type = {type: "variable", style: "variable-3"};
- var tsKeywords = {
- // object-like things
- "interface": kw("class"),
- "implements": C,
- "namespace": C,
- "module": kw("module"),
- "enum": kw("module"),
-
- // scope modifiers
- "public": kw("modifier"),
- "private": kw("modifier"),
- "protected": kw("modifier"),
- "abstract": kw("modifier"),
-
- // operators
- "as": operator,
-
- // types
- "string": type, "number": type, "boolean": type, "any": type
- };
-
- for (var attr in tsKeywords) {
- jsKeywords[attr] = tsKeywords[attr];
- }
- }
-
- return jsKeywords;
}();
- var isOperatorChar = /[+\-*&%=<>!?|~^]/;
+ var isOperatorChar = /[+\-*&%=<>!?|~^@]/;
var isJsonldKeyword = /^@(context|id|value|language|type|container|list|set|reverse|index|base|vocab|graph)"/;
function readRegexp(stream) {
@@ -105,7 +67,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
if (ch == '"' || ch == "'") {
state.tokenize = tokenString(ch);
return state.tokenize(stream, state);
- } else if (ch == "." && stream.match(/^\d+(?:[eE][+\-]?\d+)?/)) {
+ } else if (ch == "." && stream.match(/^\d[\d_]*(?:[eE][+\-]?[\d_]+)?/)) {
return ret("number", "number");
} else if (ch == "." && stream.match("..")) {
return ret("spread", "meta");
@@ -113,17 +75,10 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
return ret(ch);
} else if (ch == "=" && stream.eat(">")) {
return ret("=>", "operator");
- } else if (ch == "0" && stream.eat(/x/i)) {
- stream.eatWhile(/[\da-f]/i);
- return ret("number", "number");
- } else if (ch == "0" && stream.eat(/o/i)) {
- stream.eatWhile(/[0-7]/i);
- return ret("number", "number");
- } else if (ch == "0" && stream.eat(/b/i)) {
- stream.eatWhile(/[01]/i);
+ } else if (ch == "0" && stream.match(/^(?:x[\dA-Fa-f_]+|o[0-7_]+|b[01_]+)n?/)) {
return ret("number", "number");
} else if (/\d/.test(ch)) {
- stream.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/);
+ stream.match(/^[\d_]*(?:n|(?:\.[\d_]*)?(?:[eE][+\-]?[\d_]+)?)?/);
return ret("number", "number");
} else if (ch == "/") {
if (stream.eat("*")) {
@@ -134,10 +89,10 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
return ret("comment", "comment");
} else if (expressionAllowed(stream, state, 1)) {
readRegexp(stream);
- stream.match(/^\b(([gimyu])(?![gimyu]*\2))+\b/);
+ stream.match(/^\b(([gimyus])(?![gimyus]*\2))+\b/);
return ret("regexp", "string-2");
} else {
- stream.eatWhile(isOperatorChar);
+ stream.eat("=");
return ret("operator", "operator", stream.current());
}
} else if (ch == "`") {
@@ -146,14 +101,31 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
} else if (ch == "#") {
stream.skipToEnd();
return ret("error", "error");
+ } else if (ch == "<" && stream.match("!--") || ch == "-" && stream.match("->")) {
+ stream.skipToEnd()
+ return ret("comment", "comment")
} else if (isOperatorChar.test(ch)) {
- stream.eatWhile(isOperatorChar);
+ if (ch != ">" || !state.lexical || state.lexical.type != ">") {
+ if (stream.eat("=")) {
+ if (ch == "!" || ch == "=") stream.eat("=")
+ } else if (/[<>*+\-]/.test(ch)) {
+ stream.eat(ch)
+ if (ch == ">") stream.eat(ch)
+ }
+ }
return ret("operator", "operator", stream.current());
} else if (wordRE.test(ch)) {
stream.eatWhile(wordRE);
- var word = stream.current(), known = keywords.propertyIsEnumerable(word) && keywords[word];
- return (known && state.lastType != ".") ? ret(known.type, known.style, word) :
- ret("variable", "variable", word);
+ var word = stream.current()
+ if (state.lastType != ".") {
+ if (keywords.propertyIsEnumerable(word)) {
+ var kw = keywords[word]
+ return ret(kw.type, kw.style, word)
+ }
+ if (word == "async" && stream.match(/^(\s|\/\*.*?\*\/)*[\[\(\w]/, false))
+ return ret("async", "keyword", word)
+ }
+ return ret("variable", "variable", word)
}
}
@@ -210,19 +182,28 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
var arrow = stream.string.indexOf("=>", stream.start);
if (arrow < 0) return;
+ if (isTS) { // Try to skip TypeScript return type declarations after the arguments
+ var m = /:\s*(?:\w+(?:<[^>]*>|\[\])?|\{[^}]*\})\s*$/.exec(stream.string.slice(stream.start, arrow))
+ if (m) arrow = m.index
+ }
+
var depth = 0, sawSomething = false;
for (var pos = arrow - 1; pos >= 0; --pos) {
var ch = stream.string.charAt(pos);
var bracket = brackets.indexOf(ch);
if (bracket >= 0 && bracket < 3) {
if (!depth) { ++pos; break; }
- if (--depth == 0) break;
+ if (--depth == 0) { if (ch == "(") sawSomething = true; break; }
} else if (bracket >= 3 && bracket < 6) {
++depth;
} else if (wordRE.test(ch)) {
sawSomething = true;
- } else if (/["'\/]/.test(ch)) {
- return;
+ } else if (/["'\/`]/.test(ch)) {
+ for (;; --pos) {
+ if (pos == 0) return
+ var next = stream.string.charAt(pos - 1)
+ if (next == ch && stream.string.charAt(pos - 2) != "\\") { pos--; break }
+ }
} else if (sawSomething && !depth) {
++pos;
break;
@@ -284,35 +265,68 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
pass.apply(null, arguments);
return true;
}
+ function inList(name, list) {
+ for (var v = list; v; v = v.next) if (v.name == name) return true
+ return false;
+ }
function register(varname) {
- function inList(list) {
- for (var v = list; v; v = v.next)
- if (v.name == varname) return true;
- return false;
- }
var state = cx.state;
cx.marked = "def";
if (state.context) {
- if (inList(state.localVars)) return;
- state.localVars = {name: varname, next: state.localVars};
- } else {
- if (inList(state.globalVars)) return;
- if (parserConfig.globalVars)
- state.globalVars = {name: varname, next: state.globalVars};
+ if (state.lexical.info == "var" && state.context && state.context.block) {
+ // FIXME function decls are also not block scoped
+ var newContext = registerVarScoped(varname, state.context)
+ if (newContext != null) {
+ state.context = newContext
+ return
+ }
+ } else if (!inList(varname, state.localVars)) {
+ state.localVars = new Var(varname, state.localVars)
+ return
+ }
}
+ // Fall through means this is global
+ if (parserConfig.globalVars && !inList(varname, state.globalVars))
+ state.globalVars = new Var(varname, state.globalVars)
+ }
+ function registerVarScoped(varname, context) {
+ if (!context) {
+ return null
+ } else if (context.block) {
+ var inner = registerVarScoped(varname, context.prev)
+ if (!inner) return null
+ if (inner == context.prev) return context
+ return new Context(inner, context.vars, true)
+ } else if (inList(varname, context.vars)) {
+ return context
+ } else {
+ return new Context(context.prev, new Var(varname, context.vars), false)
+ }
+ }
+
+ function isModifier(name) {
+ return name == "public" || name == "private" || name == "protected" || name == "abstract" || name == "readonly"
}
// Combinators
- var defaultVars = {name: "this", next: {name: "arguments"}};
+ function Context(prev, vars, block) { this.prev = prev; this.vars = vars; this.block = block }
+ function Var(name, next) { this.name = name; this.next = next }
+
+ var defaultVars = new Var("this", new Var("arguments", null))
function pushcontext() {
- cx.state.context = {prev: cx.state.context, vars: cx.state.localVars};
- cx.state.localVars = defaultVars;
+ cx.state.context = new Context(cx.state.context, cx.state.localVars, false)
+ cx.state.localVars = defaultVars
+ }
+ function pushblockcontext() {
+ cx.state.context = new Context(cx.state.context, cx.state.localVars, true)
+ cx.state.localVars = null
}
function popcontext() {
- cx.state.localVars = cx.state.context.vars;
- cx.state.context = cx.state.context.prev;
+ cx.state.localVars = cx.state.context.vars
+ cx.state.context = cx.state.context.prev
}
+ popcontext.lex = true
function pushlex(type, info) {
var result = function() {
var state = cx.state, indent = state.indented;
@@ -337,72 +351,99 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
function expect(wanted) {
function exp(type) {
if (type == wanted) return cont();
- else if (wanted == ";") return pass();
+ else if (wanted == ";" || type == "}" || type == ")" || type == "]") return pass();
else return cont(exp);
};
return exp;
}
function statement(type, value) {
- if (type == "var") return cont(pushlex("vardef", value.length), vardef, expect(";"), poplex);
- if (type == "keyword a") return cont(pushlex("form"), expression, statement, poplex);
+ if (type == "var") return cont(pushlex("vardef", value), vardef, expect(";"), poplex);
+ if (type == "keyword a") return cont(pushlex("form"), parenExpr, statement, poplex);
if (type == "keyword b") return cont(pushlex("form"), statement, poplex);
- if (type == "{") return cont(pushlex("}"), block, poplex);
+ if (type == "keyword d") return cx.stream.match(/^\s*$/, false) ? cont() : cont(pushlex("stat"), maybeexpression, expect(";"), poplex);
+ if (type == "debugger") return cont(expect(";"));
+ if (type == "{") return cont(pushlex("}"), pushblockcontext, block, poplex, popcontext);
if (type == ";") return cont();
if (type == "if") {
if (cx.state.lexical.info == "else" && cx.state.cc[cx.state.cc.length - 1] == poplex)
cx.state.cc.pop()();
- return cont(pushlex("form"), expression, statement, poplex, maybeelse);
+ return cont(pushlex("form"), parenExpr, statement, poplex, maybeelse);
}
if (type == "function") return cont(functiondef);
if (type == "for") return cont(pushlex("form"), forspec, statement, poplex);
- if (type == "variable") return cont(pushlex("stat"), maybelabel);
- if (type == "switch") return cont(pushlex("form"), expression, pushlex("}", "switch"), expect("{"),
- block, poplex, poplex);
+ if (type == "class" || (isTS && value == "interface")) {
+ cx.marked = "keyword"
+ return cont(pushlex("form", type == "class" ? type : value), className, poplex)
+ }
+ if (type == "variable") {
+ if (isTS && value == "declare") {
+ cx.marked = "keyword"
+ return cont(statement)
+ } else if (isTS && (value == "module" || value == "enum" || value == "type") && cx.stream.match(/^\s*\w/, false)) {
+ cx.marked = "keyword"
+ if (value == "enum") return cont(enumdef);
+ else if (value == "type") return cont(typename, expect("operator"), typeexpr, expect(";"));
+ else return cont(pushlex("form"), pattern, expect("{"), pushlex("}"), block, poplex, poplex)
+ } else if (isTS && value == "namespace") {
+ cx.marked = "keyword"
+ return cont(pushlex("form"), expression, statement, poplex)
+ } else if (isTS && value == "abstract") {
+ cx.marked = "keyword"
+ return cont(statement)
+ } else {
+ return cont(pushlex("stat"), maybelabel);
+ }
+ }
+ if (type == "switch") return cont(pushlex("form"), parenExpr, expect("{"), pushlex("}", "switch"), pushblockcontext,
+ block, poplex, poplex, popcontext);
if (type == "case") return cont(expression, expect(":"));
if (type == "default") return cont(expect(":"));
- if (type == "catch") return cont(pushlex("form"), pushcontext, expect("("), funarg, expect(")"),
- statement, poplex, popcontext);
- if (type == "class") return cont(pushlex("form"), className, poplex);
+ if (type == "catch") return cont(pushlex("form"), pushcontext, maybeCatchBinding, statement, poplex, popcontext);
if (type == "export") return cont(pushlex("stat"), afterExport, poplex);
if (type == "import") return cont(pushlex("stat"), afterImport, poplex);
- if (type == "module") return cont(pushlex("form"), pattern, pushlex("}"), expect("{"), block, poplex, poplex)
if (type == "async") return cont(statement)
+ if (value == "@") return cont(expression, statement)
return pass(pushlex("stat"), expression, expect(";"), poplex);
}
- function expression(type) {
- return expressionInner(type, false);
+ function maybeCatchBinding(type) {
+ if (type == "(") return cont(funarg, expect(")"))
}
- function expressionNoComma(type) {
- return expressionInner(type, true);
+ function expression(type, value) {
+ return expressionInner(type, value, false);
}
- function expressionInner(type, noComma) {
+ function expressionNoComma(type, value) {
+ return expressionInner(type, value, true);
+ }
+ function parenExpr(type) {
+ if (type != "(") return pass()
+ return cont(pushlex(")"), expression, expect(")"), poplex)
+ }
+ function expressionInner(type, value, noComma) {
if (cx.state.fatArrowAt == cx.stream.start) {
var body = noComma ? arrowBodyNoComma : arrowBody;
- if (type == "(") return cont(pushcontext, pushlex(")"), commasep(pattern, ")"), poplex, expect("=>"), body, popcontext);
+ if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, expect("=>"), body, popcontext);
else if (type == "variable") return pass(pushcontext, pattern, expect("=>"), body, popcontext);
}
var maybeop = noComma ? maybeoperatorNoComma : maybeoperatorComma;
if (atomicTypes.hasOwnProperty(type)) return cont(maybeop);
if (type == "function") return cont(functiondef, maybeop);
- if (type == "keyword c" || type == "async") return cont(noComma ? maybeexpressionNoComma : maybeexpression);
+ if (type == "class" || (isTS && value == "interface")) { cx.marked = "keyword"; return cont(pushlex("form"), classExpression, poplex); }
+ if (type == "keyword c" || type == "async") return cont(noComma ? expressionNoComma : expression);
if (type == "(") return cont(pushlex(")"), maybeexpression, expect(")"), poplex, maybeop);
if (type == "operator" || type == "spread") return cont(noComma ? expressionNoComma : expression);
if (type == "[") return cont(pushlex("]"), arrayLiteral, poplex, maybeop);
if (type == "{") return contCommasep(objprop, "}", null, maybeop);
if (type == "quasi") return pass(quasi, maybeop);
if (type == "new") return cont(maybeTarget(noComma));
+ if (type == "import") return cont(expression);
return cont();
}
function maybeexpression(type) {
if (type.match(/[;\}\)\],]/)) return pass();
return pass(expression);
}
- function maybeexpressionNoComma(type) {
- if (type.match(/[;\}\)\],]/)) return pass();
- return pass(expressionNoComma);
- }
function maybeoperatorComma(type, value) {
if (type == ",") return cont(expression);
@@ -413,7 +454,9 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
var expr = noComma == false ? expression : expressionNoComma;
if (type == "=>") return cont(pushcontext, noComma ? arrowBodyNoComma : arrowBody, popcontext);
if (type == "operator") {
- if (/\+\+|--/.test(value)) return cont(me);
+ if (/\+\+|--/.test(value) || isTS && value == "!") return cont(me);
+ if (isTS && value == "<" && cx.stream.match(/^([^>]|<.*?>)*>\s*\(/, false))
+ return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, me);
if (value == "?") return cont(expression, expect(":"), expr);
return cont(expr);
}
@@ -422,6 +465,12 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
if (type == "(") return contCommasep(expressionNoComma, ")", "call", me);
if (type == ".") return cont(property, me);
if (type == "[") return cont(pushlex("]"), maybeexpression, expect("]"), poplex, me);
+ if (isTS && value == "as") { cx.marked = "keyword"; return cont(typeexpr, me) }
+ if (type == "regexp") {
+ cx.state.lastType = cx.marked = "operator"
+ cx.stream.backUp(cx.stream.pos - cx.stream.start - 1)
+ return cont(expr)
+ }
}
function quasi(type, value) {
if (type != "quasi") return pass();
@@ -446,6 +495,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
function maybeTarget(noComma) {
return function(type) {
if (type == ".") return cont(noComma ? targetNoComma : target);
+ else if (type == "variable" && isTS) return cont(maybeTypeArgs, noComma ? maybeoperatorNoComma : maybeoperatorComma)
else return pass(noComma ? expressionNoComma : expression);
};
}
@@ -463,22 +513,33 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
if (type == "variable") {cx.marked = "property"; return cont();}
}
function objprop(type, value) {
- if (type == "async") return cont(objprop);
- if (type == "variable" || cx.style == "keyword") {
+ if (type == "async") {
+ cx.marked = "property";
+ return cont(objprop);
+ } else if (type == "variable" || cx.style == "keyword") {
cx.marked = "property";
if (value == "get" || value == "set") return cont(getterSetter);
+ var m // Work around fat-arrow-detection complication for detecting typescript typed arrow params
+ if (isTS && cx.state.fatArrowAt == cx.stream.start && (m = cx.stream.match(/^\s*:\s*/, false)))
+ cx.state.fatArrowAt = cx.stream.pos + m[0].length
return cont(afterprop);
} else if (type == "number" || type == "string") {
cx.marked = jsonldMode ? "property" : (cx.style + " property");
return cont(afterprop);
} else if (type == "jsonld-keyword") {
return cont(afterprop);
- } else if (type == "modifier") {
+ } else if (isTS && isModifier(value)) {
+ cx.marked = "keyword"
return cont(objprop)
} else if (type == "[") {
- return cont(expression, expect("]"), afterprop);
+ return cont(expression, maybetype, expect("]"), afterprop);
} else if (type == "spread") {
- return cont(expression);
+ return cont(expressionNoComma, afterprop);
+ } else if (value == "*") {
+ cx.marked = "keyword";
+ return cont(objprop);
+ } else if (type == ":") {
+ return pass(afterprop)
}
}
function getterSetter(type) {
@@ -490,9 +551,9 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
if (type == ":") return cont(expressionNoComma);
if (type == "(") return pass(functiondef);
}
- function commasep(what, end) {
+ function commasep(what, end, sep) {
function proceed(type, value) {
- if (type == ",") {
+ if (sep ? sep.indexOf(type) > -1 : type == ",") {
var lex = cx.state.lexical;
if (lex.info == "call") lex.pos = (lex.pos || 0) + 1;
return cont(function(type, value) {
@@ -501,6 +562,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
}, proceed);
}
if (type == end || value == end) return cont();
+ if (sep && sep.indexOf(";") > -1) return pass(what)
return cont(expect(end));
}
return function(type, value) {
@@ -517,27 +579,91 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
if (type == "}") return cont();
return pass(statement, block);
}
- function maybetype(type) {
- if (isTS && type == ":") return cont(typeexpr);
+ function maybetype(type, value) {
+ if (isTS) {
+ if (type == ":") return cont(typeexpr);
+ if (value == "?") return cont(maybetype);
+ }
}
- function maybedefault(_, value) {
- if (value == "=") return cont(expressionNoComma);
+ function maybetypeOrIn(type, value) {
+ if (isTS && (type == ":" || value == "in")) return cont(typeexpr)
}
- function typeexpr(type) {
- if (type == "variable") {cx.marked = "variable-3"; return cont(afterType);}
+ function mayberettype(type) {
+ if (isTS && type == ":") {
+ if (cx.stream.match(/^\s*\w+\s+is\b/, false)) return cont(expression, isKW, typeexpr)
+ else return cont(typeexpr)
+ }
+ }
+ function isKW(_, value) {
+ if (value == "is") {
+ cx.marked = "keyword"
+ return cont()
+ }
+ }
+ function typeexpr(type, value) {
+ if (value == "keyof" || value == "typeof" || value == "infer") {
+ cx.marked = "keyword"
+ return cont(value == "typeof" ? expressionNoComma : typeexpr)
+ }
+ if (type == "variable" || value == "void") {
+ cx.marked = "type"
+ return cont(afterType)
+ }
+ if (value == "|" || value == "&") return cont(typeexpr)
+ if (type == "string" || type == "number" || type == "atom") return cont(afterType);
+ if (type == "[") return cont(pushlex("]"), commasep(typeexpr, "]", ","), poplex, afterType)
+ if (type == "{") return cont(pushlex("}"), commasep(typeprop, "}", ",;"), poplex, afterType)
+ if (type == "(") return cont(commasep(typearg, ")"), maybeReturnType, afterType)
+ if (type == "<") return cont(commasep(typeexpr, ">"), typeexpr)
+ }
+ function maybeReturnType(type) {
+ if (type == "=>") return cont(typeexpr)
+ }
+ function typeprop(type, value) {
+ if (type == "variable" || cx.style == "keyword") {
+ cx.marked = "property"
+ return cont(typeprop)
+ } else if (value == "?" || type == "number" || type == "string") {
+ return cont(typeprop)
+ } else if (type == ":") {
+ return cont(typeexpr)
+ } else if (type == "[") {
+ return cont(expect("variable"), maybetypeOrIn, expect("]"), typeprop)
+ } else if (type == "(") {
+ return pass(functiondecl, typeprop)
+ }
+ }
+ function typearg(type, value) {
+ if (type == "variable" && cx.stream.match(/^\s*[?:]/, false) || value == "?") return cont(typearg)
+ if (type == ":") return cont(typeexpr)
+ if (type == "spread") return cont(typearg)
+ return pass(typeexpr)
}
function afterType(type, value) {
- if (value == "<") return cont(commasep(typeexpr, ">"), afterType)
- if (type == "[") return cont(expect("]"), afterType)
+ if (value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, afterType)
+ if (value == "|" || type == "." || value == "&") return cont(typeexpr)
+ if (type == "[") return cont(typeexpr, expect("]"), afterType)
+ if (value == "extends" || value == "implements") { cx.marked = "keyword"; return cont(typeexpr) }
+ if (value == "?") return cont(typeexpr, expect(":"), typeexpr)
}
- function vardef() {
+ function maybeTypeArgs(_, value) {
+ if (value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, afterType)
+ }
+ function typeparam() {
+ return pass(typeexpr, maybeTypeDefault)
+ }
+ function maybeTypeDefault(_, value) {
+ if (value == "=") return cont(typeexpr)
+ }
+ function vardef(_, value) {
+ if (value == "enum") {cx.marked = "keyword"; return cont(enumdef)}
return pass(pattern, maybetype, maybeAssign, vardefCont);
}
function pattern(type, value) {
- if (type == "modifier") return cont(pattern)
+ if (isTS && isModifier(value)) { cx.marked = "keyword"; return cont(pattern) }
if (type == "variable") { register(value); return cont(); }
if (type == "spread") return cont(pattern);
- if (type == "[") return contCommasep(pattern, "]");
+ if (type == "[") return contCommasep(eltpattern, "]");
if (type == "{") return contCommasep(proppattern, "}");
}
function proppattern(type, value) {
@@ -548,8 +674,12 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
if (type == "variable") cx.marked = "property";
if (type == "spread") return cont(pattern);
if (type == "}") return pass();
+ if (type == "[") return cont(expression, expect(']'), expect(':'), proppattern);
return cont(expect(":"), pattern, maybeAssign);
}
+ function eltpattern() {
+ return pass(pattern, maybeAssign)
+ }
function maybeAssign(_type, value) {
if (value == "=") return cont(expressionNoComma);
}
@@ -559,73 +689,109 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
function maybeelse(type, value) {
if (type == "keyword b" && value == "else") return cont(pushlex("form", "else"), statement, poplex);
}
- function forspec(type) {
- if (type == "(") return cont(pushlex(")"), forspec1, expect(")"), poplex);
+ function forspec(type, value) {
+ if (value == "await") return cont(forspec);
+ if (type == "(") return cont(pushlex(")"), forspec1, poplex);
}
function forspec1(type) {
- if (type == "var") return cont(vardef, expect(";"), forspec2);
- if (type == ";") return cont(forspec2);
- if (type == "variable") return cont(formaybeinof);
- return pass(expression, expect(";"), forspec2);
- }
- function formaybeinof(_type, value) {
- if (value == "in" || value == "of") { cx.marked = "keyword"; return cont(expression); }
- return cont(maybeoperatorComma, forspec2);
+ if (type == "var") return cont(vardef, forspec2);
+ if (type == "variable") return cont(forspec2);
+ return pass(forspec2)
}
function forspec2(type, value) {
- if (type == ";") return cont(forspec3);
- if (value == "in" || value == "of") { cx.marked = "keyword"; return cont(expression); }
- return pass(expression, expect(";"), forspec3);
- }
- function forspec3(type) {
- if (type != ")") cont(expression);
+ if (type == ")") return cont()
+ if (type == ";") return cont(forspec2)
+ if (value == "in" || value == "of") { cx.marked = "keyword"; return cont(expression, forspec2) }
+ return pass(expression, forspec2)
}
function functiondef(type, value) {
if (value == "*") {cx.marked = "keyword"; return cont(functiondef);}
if (type == "variable") {register(value); return cont(functiondef);}
- if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, maybetype, statement, popcontext);
+ if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, mayberettype, statement, popcontext);
+ if (isTS && value == "<") return cont(pushlex(">"), commasep(typeparam, ">"), poplex, functiondef)
}
- function funarg(type) {
+ function functiondecl(type, value) {
+ if (value == "*") {cx.marked = "keyword"; return cont(functiondecl);}
+ if (type == "variable") {register(value); return cont(functiondecl);}
+ if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, mayberettype, popcontext);
+ if (isTS && value == "<") return cont(pushlex(">"), commasep(typeparam, ">"), poplex, functiondecl)
+ }
+ function typename(type, value) {
+ if (type == "keyword" || type == "variable") {
+ cx.marked = "type"
+ return cont(typename)
+ } else if (value == "<") {
+ return cont(pushlex(">"), commasep(typeparam, ">"), poplex)
+ }
+ }
+ function funarg(type, value) {
+ if (value == "@") cont(expression, funarg)
if (type == "spread") return cont(funarg);
- return pass(pattern, maybetype, maybedefault);
+ if (isTS && isModifier(value)) { cx.marked = "keyword"; return cont(funarg); }
+ if (isTS && type == "this") return cont(maybetype, maybeAssign)
+ return pass(pattern, maybetype, maybeAssign);
+ }
+ function classExpression(type, value) {
+ // Class expressions may have an optional name.
+ if (type == "variable") return className(type, value);
+ return classNameAfter(type, value);
}
function className(type, value) {
if (type == "variable") {register(value); return cont(classNameAfter);}
}
function classNameAfter(type, value) {
- if (value == "extends") return cont(expression, classNameAfter);
+ if (value == "<") return cont(pushlex(">"), commasep(typeparam, ">"), poplex, classNameAfter)
+ if (value == "extends" || value == "implements" || (isTS && type == ",")) {
+ if (value == "implements") cx.marked = "keyword";
+ return cont(isTS ? typeexpr : expression, classNameAfter);
+ }
if (type == "{") return cont(pushlex("}"), classBody, poplex);
}
function classBody(type, value) {
- if (type == "variable" || cx.style == "keyword") {
- if (value == "static") {
- cx.marked = "keyword";
- return cont(classBody);
- }
- cx.marked = "property";
- if (value == "get" || value == "set") return cont(classGetterSetter, functiondef, classBody);
- return cont(functiondef, classBody);
+ if (type == "async" ||
+ (type == "variable" &&
+ (value == "static" || value == "get" || value == "set" || (isTS && isModifier(value))) &&
+ cx.stream.match(/^\s+[\w$\xa1-\uffff]/, false))) {
+ cx.marked = "keyword";
+ return cont(classBody);
}
+ if (type == "variable" || cx.style == "keyword") {
+ cx.marked = "property";
+ return cont(isTS ? classfield : functiondef, classBody);
+ }
+ if (type == "number" || type == "string") return cont(isTS ? classfield : functiondef, classBody);
+ if (type == "[")
+ return cont(expression, maybetype, expect("]"), isTS ? classfield : functiondef, classBody)
if (value == "*") {
cx.marked = "keyword";
return cont(classBody);
}
- if (type == ";") return cont(classBody);
+ if (isTS && type == "(") return pass(functiondecl, classBody)
+ if (type == ";" || type == ",") return cont(classBody);
if (type == "}") return cont();
+ if (value == "@") return cont(expression, classBody)
}
- function classGetterSetter(type) {
- if (type != "variable") return pass();
- cx.marked = "property";
- return cont();
+ function classfield(type, value) {
+ if (value == "?") return cont(classfield)
+ if (type == ":") return cont(typeexpr, maybeAssign)
+ if (value == "=") return cont(expressionNoComma)
+ var context = cx.state.lexical.prev, isInterface = context && context.info == "interface"
+ return pass(isInterface ? functiondecl : functiondef)
}
- function afterExport(_type, value) {
+ function afterExport(type, value) {
if (value == "*") { cx.marked = "keyword"; return cont(maybeFrom, expect(";")); }
if (value == "default") { cx.marked = "keyword"; return cont(expression, expect(";")); }
+ if (type == "{") return cont(commasep(exportField, "}"), maybeFrom, expect(";"));
return pass(statement);
}
+ function exportField(type, value) {
+ if (value == "as") { cx.marked = "keyword"; return cont(expect("variable")); }
+ if (type == "variable") return pass(expressionNoComma, exportField);
+ }
function afterImport(type) {
if (type == "string") return cont();
- return pass(importSpec, maybeFrom);
+ if (type == "(") return pass(expression);
+ return pass(importSpec, maybeMoreImports, maybeFrom);
}
function importSpec(type, value) {
if (type == "{") return contCommasep(importSpec, "}");
@@ -633,6 +799,9 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
if (value == "*") cx.marked = "keyword";
return cont(maybeAs);
}
+ function maybeMoreImports(type) {
+ if (type == ",") return cont(importSpec, maybeMoreImports)
+ }
function maybeAs(_type, value) {
if (value == "as") { cx.marked = "keyword"; return cont(importSpec); }
}
@@ -641,7 +810,13 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
}
function arrayLiteral(type) {
if (type == "]") return cont();
- return pass(expressionNoComma, commasep(expressionNoComma, "]"));
+ return pass(commasep(expressionNoComma, "]"));
+ }
+ function enumdef() {
+ return pass(pushlex("form"), pattern, expect("{"), pushlex("}"), commasep(enummember, "}"), poplex, poplex)
+ }
+ function enummember() {
+ return pass(pattern, maybeAssign);
}
function isContinuedStatement(state, textAfter) {
@@ -650,6 +825,12 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
/[,.]/.test(textAfter.charAt(0));
}
+ function expressionAllowed(stream, state, backUp) {
+ return state.tokenize == tokenBase &&
+ /^(?:operator|sof|keyword [bcd]|case|new|export|default|spread|[\[{}\(,;:]|=>)$/.test(state.lastType) ||
+ (state.lastType == "quasi" && /\{\s*$/.test(stream.string.slice(0, stream.pos - (backUp || 0))))
+ }
+
// Interface
return {
@@ -660,7 +841,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
cc: [],
lexical: new JSLexical((basecolumn || 0) - indentUnit, 0, "block", false),
localVars: parserConfig.localVars,
- context: parserConfig.localVars && {vars: parserConfig.localVars},
+ context: parserConfig.localVars && new Context(null, null, false),
indented: basecolumn || 0
};
if (parserConfig.globalVars && typeof parserConfig.globalVars == "object")
@@ -685,19 +866,23 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
indent: function(state, textAfter) {
if (state.tokenize == tokenComment) return CodeMirror.Pass;
if (state.tokenize != tokenBase) return 0;
- var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical;
+ var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical, top
// Kludge to prevent 'maybelse' from blocking lexical scope pops
if (!/^\s*else\b/.test(textAfter)) for (var i = state.cc.length - 1; i >= 0; --i) {
var c = state.cc[i];
if (c == poplex) lexical = lexical.prev;
else if (c != maybeelse) break;
}
- if (lexical.type == "stat" && firstChar == "}") lexical = lexical.prev;
+ while ((lexical.type == "stat" || lexical.type == "form") &&
+ (firstChar == "}" || ((top = state.cc[state.cc.length - 1]) &&
+ (top == maybeoperatorComma || top == maybeoperatorNoComma) &&
+ !/^[,\.=+\-*:?[\(]/.test(textAfter))))
+ lexical = lexical.prev;
if (statementIndent && lexical.type == ")" && lexical.prev.type == "stat")
lexical = lexical.prev;
var type = lexical.type, closing = firstChar == type;
- if (type == "vardef") return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? lexical.info + 1 : 0);
+ if (type == "vardef") return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? lexical.info.length + 1 : 0);
else if (type == "form" && firstChar == "{") return lexical.indented;
else if (type == "form") return lexical.indented + indentUnit;
else if (type == "stat")
@@ -711,6 +896,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
electricInput: /^\s*(?:case .*?:|default:|\{|\})$/,
blockCommentStart: jsonMode ? null : "/*",
blockCommentEnd: jsonMode ? null : "*/",
+ blockCommentContinue: jsonMode ? null : " * ",
lineComment: jsonMode ? null : "//",
fold: "brace",
closeBrackets: "()[]{}''\"\"``",
@@ -720,6 +906,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
jsonMode: jsonMode,
expressionAllowed: expressionAllowed,
+
skipExpression: function(state) {
var top = state.cc[state.cc.length - 1]
if (top == expression || top == expressionNoComma) state.cc.pop()
diff --git a/public/vendor/plugins/codemirror/mode/javascript/json-ld.html b/public/vendor/plugins/codemirror/mode/javascript/json-ld.html
index 3a37f0bce6..6a29c14453 100644
--- a/public/vendor/plugins/codemirror/mode/javascript/json-ld.html
+++ b/public/vendor/plugins/codemirror/mode/javascript/json-ld.html
@@ -10,9 +10,9 @@
-
+
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/javascript/test.js b/public/vendor/plugins/codemirror/mode/javascript/test.js
index 8916b7558f..327eac76b9 100644
--- a/public/vendor/plugins/codemirror/mode/javascript/test.js
+++ b/public/vendor/plugins/codemirror/mode/javascript/test.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function() {
var mode = CodeMirror.getMode({indentUnit: 2}, "javascript");
@@ -31,13 +31,29 @@
MT("class",
"[keyword class] [def Point] [keyword extends] [variable SuperThing] {",
- " [property get] [property prop]() { [keyword return] [number 24]; }",
+ " [keyword get] [property prop]() { [keyword return] [number 24]; }",
" [property constructor]([def x], [def y]) {",
" [keyword super]([string 'something']);",
" [keyword this].[property x] [operator =] [variable-2 x];",
" }",
"}");
+ MT("anonymous_class_expression",
+ "[keyword const] [def Adder] [operator =] [keyword class] [keyword extends] [variable Arithmetic] {",
+ " [property add]([def a], [def b]) {}",
+ "};");
+
+ MT("named_class_expression",
+ "[keyword const] [def Subber] [operator =] [keyword class] [def Subtract] {",
+ " [property sub]([def a], [def b]) {}",
+ "};");
+
+ MT("class_async_method",
+ "[keyword class] [def Foo] {",
+ " [property sayName1]() {}",
+ " [keyword async] [property sayName2]() {}",
+ "}");
+
MT("import",
"[keyword function] [def foo]() {",
" [keyword import] [def $] [keyword from] [string 'jquery'];",
@@ -47,6 +63,12 @@
MT("import_trailing_comma",
"[keyword import] {[def foo], [def bar],} [keyword from] [string 'baz']")
+ MT("import_dynamic",
+ "[keyword import]([string 'baz']).[property then]")
+
+ MT("import_dynamic",
+ "[keyword const] [def t] [operator =] [keyword import]([string 'baz']).[property then]")
+
MT("const",
"[keyword function] [def f]() {",
" [keyword const] [[ [def a], [def b] ]] [operator =] [[ [number 1], [number 2] ]];",
@@ -55,12 +77,44 @@
MT("for/of",
"[keyword for]([keyword let] [def of] [keyword of] [variable something]) {}");
+ MT("for await",
+ "[keyword for] [keyword await]([keyword let] [def of] [keyword of] [variable something]) {}");
+
MT("generator",
"[keyword function*] [def repeat]([def n]) {",
" [keyword for]([keyword var] [def i] [operator =] [number 0]; [variable-2 i] [operator <] [variable-2 n]; [operator ++][variable-2 i])",
" [keyword yield] [variable-2 i];",
"}");
+ MT("let_scoping",
+ "[keyword function] [def scoped]([def n]) {",
+ " { [keyword var] [def i]; } [variable-2 i];",
+ " { [keyword let] [def j]; [variable-2 j]; } [variable j];",
+ " [keyword if] ([atom true]) { [keyword const] [def k]; [variable-2 k]; } [variable k];",
+ "}");
+
+ MT("switch_scoping",
+ "[keyword switch] ([variable x]) {",
+ " [keyword default]:",
+ " [keyword let] [def j];",
+ " [keyword return] [variable-2 j]",
+ "}",
+ "[variable j];")
+
+ MT("leaving_scope",
+ "[keyword function] [def a]() {",
+ " {",
+ " [keyword const] [def x] [operator =] [number 1]",
+ " [keyword if] ([atom true]) {",
+ " [keyword let] [def y] [operator =] [number 2]",
+ " [keyword var] [def z] [operator =] [number 3]",
+ " [variable console].[property log]([variable-2 x], [variable-2 y], [variable-2 z])",
+ " }",
+ " [variable console].[property log]([variable-2 x], [variable y], [variable-2 z])",
+ " }",
+ " [variable console].[property log]([variable x], [variable y], [variable-2 z])",
+ "}")
+
MT("quotedStringAddition",
"[keyword let] [def f] [operator =] [variable a] [operator +] [string 'fatarrow'] [operator +] [variable c];");
@@ -73,6 +127,9 @@
"[keyword let] [def f] [operator =] ([[ [def a], [def b] ]], [def c]) [operator =>] [variable-2 a] [operator +] [variable-2 c];",
"[variable c];");
+ MT("fatArrow_stringDefault",
+ "([def a], [def b] [operator =] [string 'x\\'y']) [operator =>] [variable-2 a] [operator +] [variable-2 b]")
+
MT("spread",
"[keyword function] [def f]([def a], [meta ...][def b]) {",
" [variable something]([variable-2 a], [meta ...][variable-2 b]);",
@@ -140,6 +197,19 @@
" [number 1];",
"[number 2];");
+ MT("indent_semicolonless_if",
+ "[keyword function] [def foo]() {",
+ " [keyword if] ([variable x])",
+ " [variable foo]()",
+ "}")
+
+ MT("indent_semicolonless_if_with_statement",
+ "[keyword function] [def foo]() {",
+ " [keyword if] ([variable x])",
+ " [variable foo]()",
+ " [variable bar]()",
+ "}")
+
MT("multilinestring",
"[keyword var] [def x] [operator =] [string 'foo\\]",
"[string bar'];");
@@ -159,6 +229,12 @@
" [keyword return] [variable-2 x];",
"}");
+ MT(
+ "param_destructuring",
+ "[keyword function] [def foo]([def x] [operator =] [string-2 `foo${][number 10][string-2 }bar`]) {",
+ " [keyword return] [variable-2 x];",
+ "}");
+
MT("new_target",
"[keyword function] [def F]([def target]) {",
" [keyword if] ([variable-2 target] [operator &&] [keyword new].[keyword target].[property name]) {",
@@ -167,6 +243,236 @@
" }",
"}");
+ MT("async",
+ "[keyword async] [keyword function] [def foo]([def args]) { [keyword return] [atom true]; }");
+
+ MT("async_assignment",
+ "[keyword const] [def foo] [operator =] [keyword async] [keyword function] ([def args]) { [keyword return] [atom true]; };");
+
+ MT("async_object",
+ "[keyword let] [def obj] [operator =] { [property async]: [atom false] };");
+
+ // async be highlighet as keyword and foo as def, but it requires potentially expensive look-ahead. See #4173
+ MT("async_object_function",
+ "[keyword let] [def obj] [operator =] { [property async] [property foo]([def args]) { [keyword return] [atom true]; } };");
+
+ MT("async_object_properties",
+ "[keyword let] [def obj] [operator =] {",
+ " [property prop1]: [keyword async] [keyword function] ([def args]) { [keyword return] [atom true]; },",
+ " [property prop2]: [keyword async] [keyword function] ([def args]) { [keyword return] [atom true]; },",
+ " [property prop3]: [keyword async] [keyword function] [def prop3]([def args]) { [keyword return] [atom true]; },",
+ "};");
+
+ MT("async_arrow",
+ "[keyword const] [def foo] [operator =] [keyword async] ([def args]) [operator =>] { [keyword return] [atom true]; };");
+
+ MT("async_jquery",
+ "[variable $].[property ajax]({",
+ " [property url]: [variable url],",
+ " [property async]: [atom true],",
+ " [property method]: [string 'GET']",
+ "});");
+
+ MT("async_variable",
+ "[keyword const] [def async] [operator =] {[property a]: [number 1]};",
+ "[keyword const] [def foo] [operator =] [string-2 `bar ${][variable async].[property a][string-2 }`];")
+
+ MT("bigint", "[number 1n] [operator +] [number 0x1afn] [operator +] [number 0o064n] [operator +] [number 0b100n];")
+
+ MT("async_comment",
+ "[keyword async] [comment /**/] [keyword function] [def foo]([def args]) { [keyword return] [atom true]; }");
+
+ MT("indent_switch",
+ "[keyword switch] ([variable x]) {",
+ " [keyword default]:",
+ " [keyword return] [number 2]",
+ "}")
+
+ MT("regexp_corner_case",
+ "[operator +]{} [operator /] [atom undefined];",
+ "[[[meta ...][string-2 /\\//] ]];",
+ "[keyword void] [string-2 /\\//];",
+ "[keyword do] [string-2 /\\//]; [keyword while] ([number 0]);",
+ "[keyword if] ([number 0]) {} [keyword else] [string-2 /\\//];",
+ "[string-2 `${][variable async][operator ++][string-2 }//`];",
+ "[string-2 `${]{} [operator /] [string-2 /\\//}`];")
+
+ MT("return_eol",
+ "[keyword return]",
+ "{} [string-2 /5/]")
+
+ MT("numeric separator",
+ "[number 123_456];",
+ "[number 0xdead_c0de];",
+ "[number 0o123_456];",
+ "[number 0b1101_1101];",
+ "[number .123_456e0_1];",
+ "[number 1E+123_456];",
+ "[number 12_34_56n];")
+
+ MT("underscore property",
+ "[variable something].[property _property];",
+ "[variable something].[property _123];",
+ "[variable something].[property _for];",
+ "[variable _for];",
+ "[variable _123];")
+
+ var ts_mode = CodeMirror.getMode({indentUnit: 2}, "application/typescript")
+ function TS(name) {
+ test.mode(name, ts_mode, Array.prototype.slice.call(arguments, 1))
+ }
+
+ TS("typescript_extend_type",
+ "[keyword class] [def Foo] [keyword extends] [type Some][operator <][type Type][operator >] {}")
+
+ TS("typescript_arrow_type",
+ "[keyword let] [def x]: ([variable arg]: [type Type]) [operator =>] [type ReturnType]")
+
+ TS("typescript_class",
+ "[keyword class] [def Foo] {",
+ " [keyword public] [keyword static] [property main]() {}",
+ " [keyword private] [property _foo]: [type string];",
+ "}")
+
+ TS("typescript_literal_types",
+ "[keyword import] [keyword *] [keyword as] [def Sequelize] [keyword from] [string 'sequelize'];",
+ "[keyword interface] [def MyAttributes] {",
+ " [property truthy]: [string 'true'] [operator |] [number 1] [operator |] [atom true];",
+ " [property falsy]: [string 'false'] [operator |] [number 0] [operator |] [atom false];",
+ "}",
+ "[keyword interface] [def MyInstance] [keyword extends] [type Sequelize].[type Instance] [operator <] [type MyAttributes] [operator >] {",
+ " [property rawAttributes]: [type MyAttributes];",
+ " [property truthy]: [string 'true'] [operator |] [number 1] [operator |] [atom true];",
+ " [property falsy]: [string 'false'] [operator |] [number 0] [operator |] [atom false];",
+ "}")
+
+ TS("typescript_extend_operators",
+ "[keyword export] [keyword interface] [def UserModel] [keyword extends]",
+ " [type Sequelize].[type Model] [operator <] [type UserInstance], [type UserAttributes] [operator >] {",
+ " [property findById]: (",
+ " [variable userId]: [type number]",
+ " ) [operator =>] [type Promise] [operator <] [type Array] [operator <] { [property id], [property name] } [operator >>];",
+ " [property updateById]: (",
+ " [variable userId]: [type number],",
+ " [variable isActive]: [type boolean]",
+ " ) [operator =>] [type Promise] [operator <] [type AccountHolderNotificationPreferenceInstance] [operator >];",
+ " }")
+
+ TS("typescript_interface_with_const",
+ "[keyword const] [def hello]: {",
+ " [property prop1][operator ?]: [type string];",
+ " [property prop2][operator ?]: [type string];",
+ "} [operator =] {};")
+
+ TS("typescript_double_extend",
+ "[keyword export] [keyword interface] [def UserAttributes] {",
+ " [property id][operator ?]: [type number];",
+ " [property createdAt][operator ?]: [type Date];",
+ "}",
+ "[keyword export] [keyword interface] [def UserInstance] [keyword extends] [type Sequelize].[type Instance][operator <][type UserAttributes][operator >], [type UserAttributes] {",
+ " [property id]: [type number];",
+ " [property createdAt]: [type Date];",
+ "}");
+
+ TS("typescript_index_signature",
+ "[keyword interface] [def A] {",
+ " [[ [variable prop]: [type string] ]]: [type any];",
+ " [property prop1]: [type any];",
+ "}");
+
+ TS("typescript_generic_class",
+ "[keyword class] [def Foo][operator <][type T][operator >] {",
+ " [property bar]() {}",
+ " [property foo](): [type Foo] {}",
+ "}")
+
+ TS("typescript_type_when_keyword",
+ "[keyword export] [keyword type] [type AB] [operator =] [type A] [operator |] [type B];",
+ "[keyword type] [type Flags] [operator =] {",
+ " [property p1]: [type string];",
+ " [property p2]: [type boolean];",
+ "};")
+
+ TS("typescript_type_when_not_keyword",
+ "[keyword class] [def HasType] {",
+ " [property type]: [type string];",
+ " [property constructor]([def type]: [type string]) {",
+ " [keyword this].[property type] [operator =] [variable-2 type];",
+ " }",
+ " [property setType]({ [def type] }: { [property type]: [type string]; }) {",
+ " [keyword this].[property type] [operator =] [variable-2 type];",
+ " }",
+ "}")
+
+ TS("typescript_function_generics",
+ "[keyword function] [def a]() {}",
+ "[keyword function] [def b][operator <][type IA] [keyword extends] [type object], [type IB] [keyword extends] [type object][operator >]() {}",
+ "[keyword function] [def c]() {}")
+
+ TS("typescript_complex_return_type",
+ "[keyword function] [def A]() {",
+ " [keyword return] [keyword this].[property property];",
+ "}",
+ "[keyword function] [def B](): [type Promise][operator <]{ [[ [variable key]: [type string] ]]: [type any] } [operator |] [atom null][operator >] {",
+ " [keyword return] [keyword this].[property property];",
+ "}")
+
+ TS("typescript_complex_type_casting",
+ "[keyword const] [def giftpay] [operator =] [variable config].[property get]([string 'giftpay']) [keyword as] { [[ [variable platformUuid]: [type string] ]]: { [property version]: [type number]; [property apiCode]: [type string]; } };")
+
+ TS("typescript_keyof",
+ "[keyword function] [def x][operator <][type T] [keyword extends] [keyword keyof] [type X][operator >]([def a]: [type T]) {",
+ " [keyword return]")
+
+ TS("typescript_new_typeargs",
+ "[keyword let] [def x] [operator =] [keyword new] [variable Map][operator <][type string], [type Date][operator >]([string-2 `foo${][variable bar][string-2 }`])")
+
+ TS("modifiers",
+ "[keyword class] [def Foo] {",
+ " [keyword public] [keyword abstract] [property bar]() {}",
+ " [property constructor]([keyword readonly] [keyword private] [def x]) {}",
+ "}")
+
+ TS("arrow prop",
+ "({[property a]: [def p] [operator =>] [variable-2 p]})")
+
+ TS("generic in function call",
+ "[keyword this].[property a][operator <][type Type][operator >]([variable foo]);",
+ "[keyword this].[property a][operator <][variable Type][operator >][variable foo];")
+
+ TS("type guard",
+ "[keyword class] [def Appler] {",
+ " [keyword static] [property assertApple]([def fruit]: [type Fruit]): [variable-2 fruit] [keyword is] [type Apple] {",
+ " [keyword if] ([operator !]([variable-2 fruit] [keyword instanceof] [variable Apple]))",
+ " [keyword throw] [keyword new] [variable Error]();",
+ " }",
+ "}")
+
+ TS("type as variable",
+ "[variable type] [operator =] [variable x] [keyword as] [type Bar];");
+
+ TS("enum body",
+ "[keyword export] [keyword const] [keyword enum] [def CodeInspectionResultType] {",
+ " [def ERROR] [operator =] [string 'problem_type_error'],",
+ " [def WARNING] [operator =] [string 'problem_type_warning'],",
+ " [def META],",
+ "}")
+
+ TS("parenthesized type",
+ "[keyword class] [def Foo] {",
+ " [property x] [operator =] [keyword new] [variable A][operator <][type B], [type string][operator |](() [operator =>] [type void])[operator >]();",
+ " [keyword private] [property bar]();",
+ "}")
+
+ TS("abstract class",
+ "[keyword export] [keyword abstract] [keyword class] [def Foo] {}")
+
+ TS("interface without semicolons",
+ "[keyword interface] [def Foo] {",
+ " [property greet]([def x]: [type int]): [type blah]",
+ " [property bar]: [type void]",
+ "}")
+
var jsonld_mode = CodeMirror.getMode(
{indentUnit: 2},
{name: "javascript", jsonld: true}
diff --git a/public/vendor/plugins/codemirror/mode/javascript/typescript.html b/public/vendor/plugins/codemirror/mode/javascript/typescript.html
index 2cfc5381fe..3b217a44f9 100644
--- a/public/vendor/plugins/codemirror/mode/javascript/typescript.html
+++ b/public/vendor/plugins/codemirror/mode/javascript/typescript.html
@@ -6,10 +6,11 @@
+
-
+
-
CodeMirror
+ CodeMirror
- Home
@@ -28,13 +29,13 @@
-
You might want to use the Github-Flavored Markdown mode instead, which adds support for fenced code blocks and a few other things.
+If you also want support
+ +strikethrough,emojiand few other goodies, check out Github-Flavored Markdown mode.Optionally depends on other modes for properly highlighted code blocks, + and XML mode for properly highlighted inline XML blocks.
+ +Markdown mode supports these options:
+-
+
-
+
+ +highlightFormatting: boolean- Whether to separately highlight markdown meta characterts (
+*[]()etc.) (default:false).
+ -
+
+ +maxBlockquoteDepth: boolean- Maximum allowed blockquote nesting (default:
+0- infinite nesting).
+ -
+
+ +xml: boolean- Whether to highlight inline XML (default:
+true).
+ -
+
+ +fencedCodeBlockHighlighting: boolean- Whether to syntax-highlight fenced code blocks, if given mode is included (default:
+true).
+ -
+
+ +tokenTypeOverrides: Object- When you want ot override default token type names (e.g.
+{code: "code"}).
+ -
+
+ +allowAtxHeaderWithoutSpace: boolean- Allow lazy headers without whitespace between hashtag and text (default:
+false).
+
Optionally depends on the XML mode for properly highlighted inline XML blocks.
-MIME types defined:
text/x-markdown.Parsing/Highlighting Tests: normal, verbose.
diff --git a/public/vendor/plugins/codemirror/mode/markdown/markdown.js b/public/vendor/plugins/codemirror/mode/markdown/markdown.js index 9dd44574fc..7aa3a3e17e 100644 --- a/public/vendor/plugins/codemirror/mode/markdown/markdown.js +++ b/public/vendor/plugins/codemirror/mode/markdown/markdown.js @@ -1,5 +1,5 @@ // CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE +// Distributed under an MIT license: https://codemirror.net/LICENSE (function(mod) { if (typeof exports == "object" && typeof module == "object") // CommonJS @@ -35,15 +35,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) { if (modeCfg.maxBlockquoteDepth === undefined) modeCfg.maxBlockquoteDepth = 0; - // Should underscores in words open/close em/strong? - if (modeCfg.underscoresBreakWords === undefined) - modeCfg.underscoresBreakWords = true; - - // Use `fencedCodeBlocks` to configure fenced code blocks. false to - // disable, string to specify a precise regexp that the fence should - // match, and true to allow three or more backticks or tildes (as - // per CommonMark). - // Turn on task lists? ("- [ ] " and "- [x] ") if (modeCfg.taskLists === undefined) modeCfg.taskLists = false; @@ -51,6 +42,15 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) { if (modeCfg.strikethrough === undefined) modeCfg.strikethrough = false; + if (modeCfg.emoji === undefined) + modeCfg.emoji = false; + + if (modeCfg.fencedCodeBlockHighlighting === undefined) + modeCfg.fencedCodeBlockHighlighting = true; + + if (modeCfg.xml === undefined) + modeCfg.xml = true; + // Allow token types to be overridden by user-provided token types. if (modeCfg.tokenTypeOverrides === undefined) modeCfg.tokenTypeOverrides = {}; @@ -73,7 +73,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) { linkHref: "string", em: "em", strong: "strong", - strikethrough: "strikethrough" + strikethrough: "strikethrough", + emoji: "builtin" }; for (var tokenType in tokenTypes) { @@ -83,14 +84,15 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) { } var hrRE = /^([*\-_])(?:\s*\1){2,}\s*$/ - , ulRE = /^[*\-+]\s+/ - , olRE = /^[0-9]+([.)])\s+/ - , taskListRE = /^\[(x| )\](?=\s)/ // Must follow ulRE or olRE + , listRE = /^(?:[*\-+]|^[0-9]+([.)]))\s+/ + , taskListRE = /^\[(x| )\](?=\s)/i // Must follow listRE , atxHeaderRE = modeCfg.allowAtxHeaderWithoutSpace ? /^(#+)/ : /^(#+)(?: |$)/ , setextHeaderRE = /^ *(?:\={1,}|-{1,})\s*$/ - , textRE = /^[^#!\[\]*_\\<>` "'(~]+/ - , fencedCodeRE = new RegExp("^(" + (modeCfg.fencedCodeBlocks === true ? "~~~+|```+" : modeCfg.fencedCodeBlocks) + - ")[ \\t]*([\\w+#\-]*)"); + , textRE = /^[^#!\[\]*_\\<>` "'(~:]+/ + , fencedCodeRE = /^(~~~+|```+)[ \t]*([\w+#-]*)[^\n`]*$/ + , linkDefRE = /^\s*\[[^\]]+?\]:.*$/ // naive link-definition + , punctuation = /[!"#$%&'()*+,\-.\/:;<=>?@\[\\\]^_`{|}~\xA1\xA7\xAB\xB6\xB7\xBB\xBF\u037E\u0387\u055A-\u055F\u0589\u058A\u05BE\u05C0\u05C3\u05C6\u05F3\u05F4\u0609\u060A\u060C\u060D\u061B\u061E\u061F\u066A-\u066D\u06D4\u0700-\u070D\u07F7-\u07F9\u0830-\u083E\u085E\u0964\u0965\u0970\u0AF0\u0DF4\u0E4F\u0E5A\u0E5B\u0F04-\u0F12\u0F14\u0F3A-\u0F3D\u0F85\u0FD0-\u0FD4\u0FD9\u0FDA\u104A-\u104F\u10FB\u1360-\u1368\u1400\u166D\u166E\u169B\u169C\u16EB-\u16ED\u1735\u1736\u17D4-\u17D6\u17D8-\u17DA\u1800-\u180A\u1944\u1945\u1A1E\u1A1F\u1AA0-\u1AA6\u1AA8-\u1AAD\u1B5A-\u1B60\u1BFC-\u1BFF\u1C3B-\u1C3F\u1C7E\u1C7F\u1CC0-\u1CC7\u1CD3\u2010-\u2027\u2030-\u2043\u2045-\u2051\u2053-\u205E\u207D\u207E\u208D\u208E\u2308-\u230B\u2329\u232A\u2768-\u2775\u27C5\u27C6\u27E6-\u27EF\u2983-\u2998\u29D8-\u29DB\u29FC\u29FD\u2CF9-\u2CFC\u2CFE\u2CFF\u2D70\u2E00-\u2E2E\u2E30-\u2E42\u3001-\u3003\u3008-\u3011\u3014-\u301F\u3030\u303D\u30A0\u30FB\uA4FE\uA4FF\uA60D-\uA60F\uA673\uA67E\uA6F2-\uA6F7\uA874-\uA877\uA8CE\uA8CF\uA8F8-\uA8FA\uA8FC\uA92E\uA92F\uA95F\uA9C1-\uA9CD\uA9DE\uA9DF\uAA5C-\uAA5F\uAADE\uAADF\uAAF0\uAAF1\uABEB\uFD3E\uFD3F\uFE10-\uFE19\uFE30-\uFE52\uFE54-\uFE61\uFE63\uFE68\uFE6A\uFE6B\uFF01-\uFF03\uFF05-\uFF0A\uFF0C-\uFF0F\uFF1A\uFF1B\uFF1F\uFF20\uFF3B-\uFF3D\uFF3F\uFF5B\uFF5D\uFF5F-\uFF65]|\uD800[\uDD00-\uDD02\uDF9F\uDFD0]|\uD801\uDD6F|\uD802[\uDC57\uDD1F\uDD3F\uDE50-\uDE58\uDE7F\uDEF0-\uDEF6\uDF39-\uDF3F\uDF99-\uDF9C]|\uD804[\uDC47-\uDC4D\uDCBB\uDCBC\uDCBE-\uDCC1\uDD40-\uDD43\uDD74\uDD75\uDDC5-\uDDC9\uDDCD\uDDDB\uDDDD-\uDDDF\uDE38-\uDE3D\uDEA9]|\uD805[\uDCC6\uDDC1-\uDDD7\uDE41-\uDE43\uDF3C-\uDF3E]|\uD809[\uDC70-\uDC74]|\uD81A[\uDE6E\uDE6F\uDEF5\uDF37-\uDF3B\uDF44]|\uD82F\uDC9F|\uD836[\uDE87-\uDE8B]/ + , expandedTab = " " // CommonMark specifies tab as 4 spaces function switchInline(stream, state, f) { state.f = state.inline = f; @@ -111,6 +113,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) { function blankLine(state) { // Reset linkTitle state state.linkTitle = false; + state.linkHref = false; + state.linkText = false; // Reset EM state state.em = false; // Reset STRONG state @@ -121,91 +125,104 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) { state.quote = 0; // Reset state.indentedCode state.indentedCode = false; - if (htmlModeMissing && state.f == htmlBlock) { - state.f = inlineNormal; - state.block = blockNormal; + if (state.f == htmlBlock) { + var exit = htmlModeMissing + if (!exit) { + var inner = CodeMirror.innerMode(htmlMode, state.htmlState) + exit = inner.mode.name == "xml" && inner.state.tagStart === null && + (!inner.state.context && inner.state.tokenize.isInText) + } + if (exit) { + state.f = inlineNormal; + state.block = blockNormal; + state.htmlState = null; + } } // Reset state.trailingSpace state.trailingSpace = 0; state.trailingSpaceNewLine = false; // Mark this line as blank state.prevLine = state.thisLine - state.thisLine = null + state.thisLine = {stream: null} return null; } function blockNormal(stream, state) { - - var sol = stream.sol(); - - var prevLineIsList = state.list !== false, - prevLineIsIndentedCode = state.indentedCode; + var firstTokenOnLine = stream.column() === state.indentation; + var prevLineLineIsEmpty = lineIsEmpty(state.prevLine.stream); + var prevLineIsIndentedCode = state.indentedCode; + var prevLineIsHr = state.prevLine.hr; + var prevLineIsList = state.list !== false; + var maxNonCodeIndentation = (state.listStack[state.listStack.length - 1] || 0) + 3; state.indentedCode = false; - if (prevLineIsList) { - if (state.indentationDiff >= 0) { // Continued list - if (state.indentationDiff < 4) { // Only adjust indentation if *not* a code block - state.indentation -= state.indentationDiff; + var lineIndentation = state.indentation; + // compute once per line (on first token) + if (state.indentationDiff === null) { + state.indentationDiff = state.indentation; + if (prevLineIsList) { + // Reset inline styles which shouldn't propagate aross list items + state.em = false; + state.strong = false; + state.code = false; + state.strikethrough = false; + + state.list = null; + // While this list item's marker's indentation is less than the deepest + // list item's content's indentation,pop the deepest list item + // indentation off the stack, and update block indentation state + while (lineIndentation < state.listStack[state.listStack.length - 1]) { + state.listStack.pop(); + if (state.listStack.length) { + state.indentation = state.listStack[state.listStack.length - 1]; + // less than the first list's indent -> the line is no longer a list + } else { + state.list = false; + } + } + if (state.list !== false) { + state.indentationDiff = lineIndentation - state.listStack[state.listStack.length - 1] } - state.list = null; - } else if (state.indentation > 0) { - state.list = null; - } else { // No longer a list - state.list = false; } } + // not comprehensive (currently only for setext detection purposes) + var allowsInlineContinuation = ( + !prevLineLineIsEmpty && !prevLineIsHr && !state.prevLine.header && + (!prevLineIsList || !prevLineIsIndentedCode) && + !state.prevLine.fencedCodeEnd + ); + + var isHr = (state.list === false || prevLineIsHr || prevLineLineIsEmpty) && + state.indentation <= maxNonCodeIndentation && stream.match(hrRE); + var match = null; - if (state.indentationDiff >= 4) { + if (state.indentationDiff >= 4 && (prevLineIsIndentedCode || state.prevLine.fencedCodeEnd || + state.prevLine.header || prevLineLineIsEmpty)) { stream.skipToEnd(); - if (prevLineIsIndentedCode || lineIsEmpty(state.prevLine)) { - state.indentation -= 4; - state.indentedCode = true; - return tokenTypes.code; - } else { - return null; - } + state.indentedCode = true; + return tokenTypes.code; } else if (stream.eatSpace()) { return null; - } else if ((match = stream.match(atxHeaderRE)) && match[1].length <= 6) { + } else if (firstTokenOnLine && state.indentation <= maxNonCodeIndentation && (match = stream.match(atxHeaderRE)) && match[1].length <= 6) { + state.quote = 0; state.header = match[1].length; + state.thisLine.header = true; if (modeCfg.highlightFormatting) state.formatting = "header"; state.f = state.inline; return getType(state); - } else if (!lineIsEmpty(state.prevLine) && !state.quote && !prevLineIsList && - !prevLineIsIndentedCode && (match = stream.match(setextHeaderRE))) { - state.header = match[0].charAt(0) == '=' ? 1 : 2; - if (modeCfg.highlightFormatting) state.formatting = "header"; - state.f = state.inline; - return getType(state); - } else if (stream.eat('>')) { - state.quote = sol ? 1 : state.quote + 1; + } else if (state.indentation <= maxNonCodeIndentation && stream.eat('>')) { + state.quote = firstTokenOnLine ? 1 : state.quote + 1; if (modeCfg.highlightFormatting) state.formatting = "quote"; stream.eatSpace(); return getType(state); - } else if (stream.peek() === '[') { - return switchInline(stream, state, footnoteLink); - } else if (stream.match(hrRE, true)) { - state.hr = true; - return tokenTypes.hr; - } else if ((lineIsEmpty(state.prevLine) || prevLineIsList) && (stream.match(ulRE, false) || stream.match(olRE, false))) { - var listType = null; - if (stream.match(ulRE, true)) { - listType = 'ul'; - } else { - stream.match(olRE, true); - listType = 'ol'; - } - state.indentation = stream.column() + stream.current().length; - state.list = true; + } else if (!isHr && !state.setext && firstTokenOnLine && state.indentation <= maxNonCodeIndentation && (match = stream.match(listRE))) { + var listType = match[1] ? "ol" : "ul"; - // While this list item's marker's indentation - // is less than the deepest list item's content's indentation, - // pop the deepest list item indentation off the stack. - while (state.listStack && stream.column() < state.listStack[state.listStack.length - 1]) { - state.listStack.pop(); - } + state.indentation = lineIndentation + stream.current().length; + state.list = true; + state.quote = 0; // Add this list item's content's indentation to the stack state.listStack.push(state.indentation); @@ -216,15 +233,47 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) { state.f = state.inline; if (modeCfg.highlightFormatting) state.formatting = ["list", "list-" + listType]; return getType(state); - } else if (modeCfg.fencedCodeBlocks && (match = stream.match(fencedCodeRE, true))) { - state.fencedChars = match[1] + } else if (firstTokenOnLine && state.indentation <= maxNonCodeIndentation && (match = stream.match(fencedCodeRE, true))) { + state.quote = 0; + state.fencedEndRE = new RegExp(match[1] + "+ *$"); // try switching mode - state.localMode = getMode(match[2]); + state.localMode = modeCfg.fencedCodeBlockHighlighting && getMode(match[2]); if (state.localMode) state.localState = CodeMirror.startState(state.localMode); state.f = state.block = local; if (modeCfg.highlightFormatting) state.formatting = "code-block"; state.code = -1 return getType(state); + // SETEXT has lowest block-scope precedence after HR, so check it after + // the others (code, blockquote, list...) + } else if ( + // if setext set, indicates line after ---/=== + state.setext || ( + // line before ---/=== + (!allowsInlineContinuation || !prevLineIsList) && !state.quote && state.list === false && + !state.code && !isHr && !linkDefRE.test(stream.string) && + (match = stream.lookAhead(1)) && (match = match.match(setextHeaderRE)) + ) + ) { + if ( !state.setext ) { + state.header = match[0].charAt(0) == '=' ? 1 : 2; + state.setext = state.header; + } else { + state.header = state.setext; + // has no effect on type so we can reset it now + state.setext = 0; + stream.skipToEnd(); + if (modeCfg.highlightFormatting) state.formatting = "header"; + } + state.thisLine.header = true; + state.f = state.inline; + return getType(state); + } else if (isHr) { + stream.skipToEnd(); + state.hr = true; + state.thisLine.hr = true; + return tokenTypes.hr; + } else if (stream.peek() === '[') { + return switchInline(stream, state, footnoteLink); } return switchInline(stream, state, state.inline); @@ -246,10 +295,21 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) { } function local(stream, state) { - if (state.fencedChars && stream.match(state.fencedChars, false)) { + var currListInd = state.listStack[state.listStack.length - 1] || 0; + var hasExitedList = state.indentation < currListInd; + var maxFencedEndInd = currListInd + 3; + if (state.fencedEndRE && state.indentation <= maxFencedEndInd && (hasExitedList || stream.match(state.fencedEndRE))) { + if (modeCfg.highlightFormatting) state.formatting = "code-block"; + var returnType; + if (!hasExitedList) returnType = getType(state) state.localMode = state.localState = null; - state.f = state.block = leavingLocal; - return null; + state.block = blockNormal; + state.f = inlineNormal; + state.fencedEndRE = null; + state.code = 0 + state.thisLine.fencedCodeEnd = true; + if (hasExitedList) return switchBlock(stream, state, state.block); + return returnType; } else if (state.localMode) { return state.localMode.token(stream, state.localState); } else { @@ -258,18 +318,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) { } } - function leavingLocal(stream, state) { - stream.match(state.fencedChars); - state.block = blockNormal; - state.f = inlineNormal; - state.fencedChars = null; - if (modeCfg.highlightFormatting) state.formatting = "code-block"; - state.code = 1 - var returnType = getType(state); - state.code = 0 - return returnType; - } - // Inline function getType(state) { var styles = []; @@ -313,6 +361,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) { if (state.strong) { styles.push(tokenTypes.strong); } if (state.em) { styles.push(tokenTypes.em); } if (state.strikethrough) { styles.push(tokenTypes.strikethrough); } + if (state.emoji) { styles.push(tokenTypes.emoji); } if (state.linkText) { styles.push(tokenTypes.linkText); } if (state.code) { styles.push(tokenTypes.code); } if (state.image) { styles.push(tokenTypes.image); } @@ -371,7 +420,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) { } if (state.taskList) { - var taskOpen = stream.match(taskListRE, true)[1] !== "x"; + var taskOpen = stream.match(taskListRE, true)[1] === " "; if (taskOpen) state.taskOpen = true; else state.taskClosed = true; if (modeCfg.highlightFormatting) state.formatting = "task"; @@ -387,9 +436,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) { return getType(state); } - // Get sol() value now, before character is consumed - var sol = stream.sol(); - var ch = stream.next(); // Matches link titles present on next line @@ -399,7 +445,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) { if (ch === '(') { matchCh = ')'; } - matchCh = (matchCh+'').replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1"); + matchCh = (matchCh+'').replace(/([.?*+^\[\]\\(){}|-])/g, "\\$1"); var regex = '^\\s*(?:[^' + matchCh + '\\\\]+|\\\\\\\\|\\\\.)' + matchCh; if (stream.match(new RegExp(regex), true)) { return tokenTypes.linkHref; @@ -412,7 +458,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) { if (modeCfg.highlightFormatting) state.formatting = "code"; stream.eatWhile('`'); var count = stream.current().length - if (state.code == 0) { + if (state.code == 0 && (!state.quote || count == 1)) { state.code = count return getType(state) } else if (count == state.code) { // Must be exact @@ -443,7 +489,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) { return getType(state); } - if (ch === '[' && state.imageMarker) { + if (ch === '[' && state.imageMarker && stream.match(/[^\]]*\](\(.*?\)| ?\[.*?\])/, false)) { state.imageMarker = false; state.imageAltText = true if (modeCfg.highlightFormatting) state.formatting = "image"; @@ -459,17 +505,18 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) { return type; } - if (ch === '[' && stream.match(/[^\]]*\](\(.*\)| ?\[.*?\])/, false) && !state.image) { + if (ch === '[' && !state.image) { + if (state.linkText && stream.match(/^.*?\]/)) return getType(state) state.linkText = true; if (modeCfg.highlightFormatting) state.formatting = "link"; return getType(state); } - if (ch === ']' && state.linkText && stream.match(/\(.*?\)| ?\[.*?\]/, false)) { + if (ch === ']' && state.linkText) { if (modeCfg.highlightFormatting) state.formatting = "link"; var type = getType(state); state.linkText = false; - state.inline = state.f = linkHref; + state.inline = state.f = stream.match(/\(.*?\)| ?\[.*?\]/, false) ? linkHref : inlineNormal return type; } @@ -497,7 +544,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) { return type + tokenTypes.linkEmail; } - if (ch === '<' && stream.match(/^(!--|\w)/, false)) { + if (modeCfg.xml && ch === '<' && stream.match(/^(!--|\?|!\[CDATA\[|[a-z][a-z0-9-]*(?:\s+[a-z_:.\-]+(?:\s*=\s*[^>]+)?)*\s*(?:>|$))/i, false)) { var end = stream.string.indexOf(">", stream.pos); if (end != -1) { var atts = stream.string.substring(stream.start, end); @@ -508,44 +555,37 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) { return switchBlock(stream, state, htmlBlock); } - if (ch === '<' && stream.match(/^\/\w*?>/)) { + if (modeCfg.xml && ch === '<' && stream.match(/^\/\w*?>/)) { state.md_inside = false; return "tag"; - } - - var ignoreUnderscore = false; - if (!modeCfg.underscoresBreakWords) { - if (ch === '_' && stream.peek() !== '_' && stream.match(/(\w)/, false)) { - var prevPos = stream.pos - 2; - if (prevPos >= 0) { - var prevCh = stream.string.charAt(prevPos); - if (prevCh !== '_' && prevCh.match(/(\w)/, false)) { - ignoreUnderscore = true; - } - } + } else if (ch === "*" || ch === "_") { + var len = 1, before = stream.pos == 1 ? " " : stream.string.charAt(stream.pos - 2) + while (len < 3 && stream.eat(ch)) len++ + var after = stream.peek() || " " + // See http://spec.commonmark.org/0.27/#emphasis-and-strong-emphasis + var leftFlanking = !/\s/.test(after) && (!punctuation.test(after) || /\s/.test(before) || punctuation.test(before)) + var rightFlanking = !/\s/.test(before) && (!punctuation.test(before) || /\s/.test(after) || punctuation.test(after)) + var setEm = null, setStrong = null + if (len % 2) { // Em + if (!state.em && leftFlanking && (ch === "*" || !rightFlanking || punctuation.test(before))) + setEm = true + else if (state.em == ch && rightFlanking && (ch === "*" || !leftFlanking || punctuation.test(after))) + setEm = false } - } - if (ch === '*' || (ch === '_' && !ignoreUnderscore)) { - if (sol && stream.peek() === ' ') { - // Do nothing, surrounded by newline and space - } else if (state.strong === ch && stream.eat(ch)) { // Remove STRONG - if (modeCfg.highlightFormatting) state.formatting = "strong"; - var t = getType(state); - state.strong = false; - return t; - } else if (!state.strong && stream.eat(ch)) { // Add STRONG - state.strong = ch; - if (modeCfg.highlightFormatting) state.formatting = "strong"; - return getType(state); - } else if (state.em === ch) { // Remove EM - if (modeCfg.highlightFormatting) state.formatting = "em"; - var t = getType(state); - state.em = false; - return t; - } else if (!state.em) { // Add EM - state.em = ch; - if (modeCfg.highlightFormatting) state.formatting = "em"; - return getType(state); + if (len > 1) { // Strong + if (!state.strong && leftFlanking && (ch === "*" || !rightFlanking || punctuation.test(before))) + setStrong = true + else if (state.strong == ch && rightFlanking && (ch === "*" || !leftFlanking || punctuation.test(after))) + setStrong = false + } + if (setStrong != null || setEm != null) { + if (modeCfg.highlightFormatting) state.formatting = setEm == null ? "strong" : setStrong == null ? "em" : "strong em" + if (setEm === true) state.em = ch + if (setStrong === true) state.strong = ch + var t = getType(state) + if (setEm === false) state.em = false + if (setStrong === false) state.strong = false + return t } } else if (ch === ' ') { if (stream.eat('*') || stream.eat('_')) { // Probably surrounded by spaces @@ -580,8 +620,16 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) { } } + if (modeCfg.emoji && ch === ":" && stream.match(/^(?:[a-z_\d+][a-z_\d+-]*|\-[a-z_\d+][a-z_\d+-]*):/)) { + state.emoji = true; + if (modeCfg.highlightFormatting) state.formatting = "emoji"; + var retType = getType(state); + state.emoji = false; + return retType; + } + if (ch === ' ') { - if (stream.match(/ +$/, false)) { + if (stream.match(/^ +$/, false)) { state.trailingSpace++; } else if (state.trailingSpace) { state.trailingSpaceNewLine = true; @@ -618,7 +666,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) { } var ch = stream.next(); if (ch === '(' || ch === '[') { - state.f = state.inline = getLinkHrefInside(ch === "(" ? ")" : "]", 0); + state.f = state.inline = getLinkHrefInside(ch === "(" ? ")" : "]"); if (modeCfg.highlightFormatting) state.formatting = "link-string"; state.linkHref = true; return getType(state); @@ -628,7 +676,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) { var linkRE = { ")": /^(?:[^\\\(\)]|\\.|\((?:[^\\\(\)]|\\.)*\))*?(?=\))/, - "]": /^(?:[^\\\[\]]|\\.|\[(?:[^\\\[\\]]|\\.)*\])*?(?=\])/ + "]": /^(?:[^\\\[\]]|\\.|\[(?:[^\\\[\]]|\\.)*\])*?(?=\])/ } function getLinkHrefInside(endChar) { @@ -696,8 +744,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) { return { f: blockNormal, - prevLine: null, - thisLine: null, + prevLine: {stream: null}, + thisLine: {stream: null}, block: blockNormal, htmlState: null, @@ -714,6 +762,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) { em: false, strong: false, header: 0, + setext: 0, hr: false, taskList: false, list: false, @@ -722,7 +771,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) { trailingSpace: 0, trailingSpaceNewLine: false, strikethrough: false, - fencedChars: null + emoji: false, + fencedEndRE: null }; }, @@ -743,12 +793,16 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) { inline: s.inline, text: s.text, formatting: false, + linkText: s.linkText, linkTitle: s.linkTitle, + linkHref: s.linkHref, code: s.code, em: s.em, strong: s.strong, strikethrough: s.strikethrough, + emoji: s.emoji, header: s.header, + setext: s.setext, hr: s.hr, taskList: s.taskList, list: s.list, @@ -758,7 +812,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) { trailingSpace: s.trailingSpace, trailingSpaceNewLine: s.trailingSpaceNewLine, md_inside: s.md_inside, - fencedChars: s.fencedChars + fencedEndRE: s.fencedEndRE }; }, @@ -767,21 +821,17 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) { // Reset state.formatting state.formatting = false; - if (stream != state.thisLine) { - var forceBlankLine = state.header || state.hr; - - // Reset state.header and state.hr + if (stream != state.thisLine.stream) { state.header = 0; state.hr = false; - if (stream.match(/^\s*$/, true) || forceBlankLine) { + if (stream.match(/^\s*$/, true)) { blankLine(state); - if (!forceBlankLine) return null - state.prevLine = null + return null; } state.prevLine = state.thisLine - state.thisLine = stream + state.thisLine = {stream: stream} // Reset state.taskList state.taskList = false; @@ -790,11 +840,15 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) { state.trailingSpace = 0; state.trailingSpaceNewLine = false; - state.f = state.block; - var indentation = stream.match(/^\s*/, true)[0].replace(/\t/g, ' ').length; - state.indentationDiff = Math.min(indentation - state.indentation, 4); - state.indentation = state.indentation + state.indentationDiff; - if (indentation > 0) return null; + if (!state.localState) { + state.f = state.block; + if (state.f != htmlBlock) { + var indentation = stream.match(/^\s*/, true)[0].replace(/\t/g, expandedTab).length; + state.indentation = indentation; + state.indentationDiff = null; + if (indentation > 0) return null; + } + } } return state.f(stream, state); }, @@ -805,15 +859,26 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) { return {state: state, mode: mode}; }, + indent: function(state, textAfter, line) { + if (state.block == htmlBlock && htmlMode.indent) return htmlMode.indent(state.htmlState, textAfter, line) + if (state.localState && state.localMode.indent) return state.localMode.indent(state.localState, textAfter, line) + return CodeMirror.Pass + }, + blankLine: blankLine, getType: getType, + blockCommentStart: "", + closeBrackets: "()[]{}''\"\"``", fold: "markdown" }; return mode; }, "xml"); +CodeMirror.defineMIME("text/markdown", "markdown"); + CodeMirror.defineMIME("text/x-markdown", "markdown"); }); diff --git a/public/vendor/plugins/codemirror/mode/markdown/test.js b/public/vendor/plugins/codemirror/mode/markdown/test.js index 2f43a170ca..aa1263e118 100644 --- a/public/vendor/plugins/codemirror/mode/markdown/test.js +++ b/public/vendor/plugins/codemirror/mode/markdown/test.js @@ -1,18 +1,22 @@ // CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE +// Distributed under an MIT license: https://codemirror.net/LICENSE (function() { - var mode = CodeMirror.getMode({tabSize: 4}, "markdown"); + var config = {tabSize: 4, indentUnit: 2} + var mode = CodeMirror.getMode(config, "markdown"); function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); } - var modeHighlightFormatting = CodeMirror.getMode({tabSize: 4}, {name: "markdown", highlightFormatting: true}); + var modeHighlightFormatting = CodeMirror.getMode(config, {name: "markdown", highlightFormatting: true}); function FT(name) { test.mode(name, modeHighlightFormatting, Array.prototype.slice.call(arguments, 1)); } - var modeAtxNoSpace = CodeMirror.getMode({tabSize: 4}, {name: "markdown", allowAtxHeaderWithoutSpace: true}); + var modeMT_noXml = CodeMirror.getMode(config, {name: "markdown", xml: false}); + function MT_noXml(name) { test.mode(name, modeMT_noXml, Array.prototype.slice.call(arguments, 1)); } + var modeMT_noFencedHighlight = CodeMirror.getMode(config, {name: "markdown", fencedCodeBlockHighlighting: false}); + function MT_noFencedHighlight(name) { test.mode(name, modeMT_noFencedHighlight, Array.prototype.slice.call(arguments, 1)); } + var modeAtxNoSpace = CodeMirror.getMode(config, {name: "markdown", allowAtxHeaderWithoutSpace: true}); function AtxNoSpaceTest(name) { test.mode(name, modeAtxNoSpace, Array.prototype.slice.call(arguments, 1)); } - var modeFenced = CodeMirror.getMode({tabSize: 4}, {name: "markdown", fencedCodeBlocks: true}); - function FencedTest(name) { test.mode(name, modeFenced, Array.prototype.slice.call(arguments, 1)); } - var modeOverrideClasses = CodeMirror.getMode({tabsize: 4}, { + var modeOverrideClasses = CodeMirror.getMode(config, { name: "markdown", strikethrough: true, + emoji: true, tokenTypeOverrides: { "header" : "override-header", "code" : "override-code", @@ -30,16 +34,19 @@ "linkHref" : "override-link-href", "em" : "override-em", "strong" : "override-strong", - "strikethrough" : "override-strikethrough" + "strikethrough" : "override-strikethrough", + "emoji" : "override-emoji" }}); function TokenTypeOverrideTest(name) { test.mode(name, modeOverrideClasses, Array.prototype.slice.call(arguments, 1)); } - var modeFormattingOverride = CodeMirror.getMode({tabsize: 4}, { + var modeFormattingOverride = CodeMirror.getMode(config, { name: "markdown", highlightFormatting: true, tokenTypeOverrides: { "formatting" : "override-formatting" }}); function FormatTokenTypeOverrideTest(name) { test.mode(name, modeFormattingOverride, Array.prototype.slice.call(arguments, 1)); } + var modeET = CodeMirror.getMode(config, {name: "markdown", emoji: true}); + function ET(name) { test.mode(name, modeET, Array.prototype.slice.call(arguments, 1)); } FT("formatting_emAsterisk", @@ -64,7 +71,7 @@ "[header&header-1&formatting&formatting-header&formatting-header-1 # ][header&header-1 foo # bar ][header&header-1&formatting&formatting-header&formatting-header-1 #]"); FT("formatting_setextHeader", - "foo", + "[header&header-1 foo]", "[header&header-1&formatting&formatting-header&formatting-header-1 =]"); FT("formatting_blockquote", @@ -94,6 +101,11 @@ FT("formatting_image", "[formatting&formatting-image&image&image-marker !][formatting&formatting-image&image&image-alt-text&link [[][image&image-alt-text&link alt text][formatting&formatting-image&image&image-alt-text&link ]]][formatting&formatting-link-string&string&url (][url&string http://link.to/image.jpg][formatting&formatting-link-string&string&url )]"); + FT("codeBlock", + "[comment&formatting&formatting-code-block ```css]", + "[tag foo]", + "[comment&formatting&formatting-code-block ```]"); + MT("plainText", "foo"); @@ -141,6 +153,21 @@ "Foo", " Bar"); + MT("codeBlocksAfterATX", + "[header&header-1 # foo]", + " [comment code]"); + + MT("codeBlocksAfterSetext", + "[header&header-2 foo]", + "[header&header-2 ---]", + " [comment code]"); + + MT("codeBlocksAfterFencedCode", + "[comment ```]", + "[comment foo]", + "[comment ```]", + " [comment code]"); + // Inline code using backticks MT("inlineCodeUsingBackticks", "foo [comment `bar`]"); @@ -182,6 +209,10 @@ MT("closedBackticks", "[comment ``foo ``` bar` hello``] world"); + // info string cannot contain backtick, thus should result in inline code + MT("closingFencedMarksOnSameLine", + "[comment ``` code ```] foo"); + // atx headers // http://daringfireball.net/projects/markdown/syntax#header @@ -225,6 +256,19 @@ MT("atxH1inline", "[header&header-1 # foo ][header&header-1&em *bar*]"); + MT("atxIndentedTooMuch", + "[header&header-1 # foo]", + " [comment # bar]"); + + // disable atx inside blockquote until we implement proper blockquote inner mode + // TODO: fix to be CommonMark-compliant + MT("atxNestedInsideBlockquote", + "[quote"e-1 > # foo]"); + + MT("atxAfterBlockquote", + "[quote"e-1 > foo]", + "[header&header-1 # bar]"); + // Setext headers - H1, H2 // Per documentation, "Any number of underlining =’s or -’s will work." // http://daringfireball.net/projects/markdown/syntax#header @@ -234,27 +278,27 @@ // // Check if single underlining = works MT("setextH1", - "foo", + "[header&header-1 foo]", "[header&header-1 =]"); // Check if 3+ ='s work MT("setextH1", - "foo", + "[header&header-1 foo]", "[header&header-1 ===]"); // Check if single underlining - works MT("setextH2", - "foo", + "[header&header-2 foo]", "[header&header-2 -]"); // Check if 3+ -'s work MT("setextH2", - "foo", + "[header&header-2 foo]", "[header&header-2 ---]"); // http://spec.commonmark.org/0.19/#example-45 MT("setextH2AllowSpaces", - "foo", + "[header&header-2 foo]", " [header&header-2 ---- ]"); // http://spec.commonmark.org/0.19/#example-44 @@ -262,15 +306,86 @@ " [comment foo]", "[hr ---]"); + MT("setextAfterFencedCode", + "[comment ```]", + "[comment foo]", + "[comment ```]", + "[header&header-2 bar]", + "[header&header-2 ---]"); + + MT("setextAferATX", + "[header&header-1 # foo]", + "[header&header-2 bar]", + "[header&header-2 ---]"); + // http://spec.commonmark.org/0.19/#example-51 MT("noSetextAfterQuote", "[quote"e-1 > foo]", + "[hr ---]", + "", + "[quote"e-1 > foo]", + "[quote"e-1 bar]", "[hr ---]"); MT("noSetextAfterList", "[variable-2 - foo]", "[hr ---]"); + MT("noSetextAfterList_listContinuation", + "[variable-2 - foo]", + "bar", + "[hr ---]"); + + MT("setextAfterList_afterIndentedCode", + "[variable-2 - foo]", + "", + " [comment bar]", + "[header&header-2 baz]", + "[header&header-2 ---]"); + + MT("setextAfterList_afterFencedCodeBlocks", + "[variable-2 - foo]", + "", + " [comment ```]", + " [comment bar]", + " [comment ```]", + "[header&header-2 baz]", + "[header&header-2 ---]"); + + MT("setextAfterList_afterHeader", + "[variable-2 - foo]", + " [variable-2&header&header-1 # bar]", + "[header&header-2 baz]", + "[header&header-2 ---]"); + + MT("setextAfterList_afterHr", + "[variable-2 - foo]", + "", + " [hr ---]", + "[header&header-2 bar]", + "[header&header-2 ---]"); + + MT("setext_nestedInlineMarkup", + "[header&header-1 foo ][em&header&header-1 *bar*]", + "[header&header-1 =]"); + + MT("setext_linkDef", + "[link [[aaa]]:] [string&url http://google.com 'title']", + "[hr ---]"); + + // currently, looks max one line ahead, thus won't catch valid CommonMark + // markup + MT("setext_oneLineLookahead", + "foo", + "[header&header-1 bar]", + "[header&header-1 =]"); + + // ensure we don't regard space after dash as a list + MT("setext_emptyList", + "[header&header-2 foo]", + "[header&header-2 - ]", + "foo"); + // Single-line blockquote with trailing space MT("blockquoteSpace", "[quote"e-1 > foo]"); @@ -284,12 +399,22 @@ "foo", "[quote"e-1 > bar]"); - // Nested blockquote - MT("blockquoteSpace", + MT("blockquoteNested", "[quote"e-1 > foo]", "[quote"e-1 >][quote"e-2 > foo]", "[quote"e-1 >][quote"e-2 >][quote"e-3 > foo]"); + // ensure quote-level is inferred correctly even if indented + MT("blockquoteNestedIndented", + " [quote"e-1 > foo]", + " [quote"e-1 >][quote"e-2 > foo]", + " [quote"e-1 >][quote"e-2 >][quote"e-3 > foo]"); + + // ensure quote-level is inferred correctly even if indented + MT("blockquoteIndentedTooMuch", + "foo", + " > bar"); + // Single-line blockquote followed by normal paragraph MT("blockquoteThenParagraph", "[quote"e-1 >foo]", @@ -320,6 +445,20 @@ "", "hello"); + // disallow lists inside blockquote for now because it causes problems outside blockquote + // TODO: fix to be CommonMark-compliant + MT("listNestedInBlockquote", + "[quote"e-1 > - foo]"); + + // disallow fenced blocks inside blockquote because it causes problems outside blockquote + // TODO: fix to be CommonMark-compliant + MT("fencedBlockNestedInBlockquote", + "[quote"e-1 > ```]", + "[quote"e-1 > code]", + "[quote"e-1 > ```]", + // ensure we still allow inline code + "[quote"e-1 > ][quote"e-1&comment `code`]"); + // Header with leading space after continued blockquote (#3287, negative indentation) MT("headerAfterContinuedBlockquote", "[quote"e-1 > foo]", @@ -357,11 +496,10 @@ "[variable-2 1. foo]", "[variable-2 2. bar]"); - // Lists require a preceding blank line (per Dingus) - MT("listBogus", + MT("listFromParagraph", "foo", - "1. bar", - "2. hello"); + "[variable-2 1. bar]", + "[variable-2 2. hello]"); // List after hr MT("listAfterHr", @@ -378,32 +516,53 @@ "[variable-2 - foo]", "[hr -----]"); + MT("hrAfterFencedCode", + "[comment ```]", + "[comment code]", + "[comment ```]", + "[hr ---]"); + + // allow hr inside lists + // (require prev line to be empty or hr, TODO: non-CommonMark-compliant) + MT("hrInsideList", + "[variable-2 - foo]", + "", + " [hr ---]", + " [hr ---]", + "", + " [comment ---]"); + + MT("consecutiveHr", + "[hr ---]", + "[hr ---]", + "[hr ---]"); + // Formatting in lists (*) MT("listAsteriskFormatting", "[variable-2 * ][variable-2&em *foo*][variable-2 bar]", "[variable-2 * ][variable-2&strong **foo**][variable-2 bar]", - "[variable-2 * ][variable-2&strong **][variable-2&em&strong *foo**][variable-2&em *][variable-2 bar]", + "[variable-2 * ][variable-2&em&strong ***foo***][variable-2 bar]", "[variable-2 * ][variable-2&comment `foo`][variable-2 bar]"); // Formatting in lists (+) MT("listPlusFormatting", "[variable-2 + ][variable-2&em *foo*][variable-2 bar]", "[variable-2 + ][variable-2&strong **foo**][variable-2 bar]", - "[variable-2 + ][variable-2&strong **][variable-2&em&strong *foo**][variable-2&em *][variable-2 bar]", + "[variable-2 + ][variable-2&em&strong ***foo***][variable-2 bar]", "[variable-2 + ][variable-2&comment `foo`][variable-2 bar]"); // Formatting in lists (-) MT("listDashFormatting", "[variable-2 - ][variable-2&em *foo*][variable-2 bar]", "[variable-2 - ][variable-2&strong **foo**][variable-2 bar]", - "[variable-2 - ][variable-2&strong **][variable-2&em&strong *foo**][variable-2&em *][variable-2 bar]", + "[variable-2 - ][variable-2&em&strong ***foo***][variable-2 bar]", "[variable-2 - ][variable-2&comment `foo`][variable-2 bar]"); // Formatting in lists (1.) MT("listNumberFormatting", "[variable-2 1. ][variable-2&em *foo*][variable-2 bar]", "[variable-2 2. ][variable-2&strong **foo**][variable-2 bar]", - "[variable-2 3. ][variable-2&strong **][variable-2&em&strong *foo**][variable-2&em *][variable-2 bar]", + "[variable-2 3. ][variable-2&em&strong ***foo***][variable-2 bar]", "[variable-2 4. ][variable-2&comment `foo`][variable-2 bar]"); // Paragraph lists @@ -469,6 +628,66 @@ " [variable-3 * Otherwise, it will be part of the level where it does meet this.]", " [variable-2 * World]"); + // should handle nested and un-nested lists + MT("listCommonMark_MixedIndents", + "[variable-2 * list1]", + " [variable-2 list1]", + " [variable-2&header&header-1 # heading still part of list1]", + " [variable-2 text after heading still part of list1]", + "", + " [comment indented codeblock]", + " [variable-2 list1 after code block]", + " [variable-3 * list2]", + // amount of spaces on empty lines between lists doesn't matter + " ", + // extra empty lines irrelevant + "", + "", + " [variable-3 indented text part of list2]", + " [keyword * list3]", + "", + " [variable-3 text at level of list2]", + "", + " [variable-2 de-indented text part of list1 again]", + "", + " [variable-2&comment ```]", + " [comment code]", + " [variable-2&comment ```]", + "", + " [variable-2 text after fenced code]"); + + // should correctly parse numbered list content indentation + MT("listCommonMark_NumeberedListIndent", + "[variable-2 1000. list with base indent of 6]", + "", + " [variable-2 text must be indented 6 spaces at minimum]", + "", + " [variable-2 9-spaces indented text still part of list]", + "", + " [comment indented codeblock starts at 10 spaces]", + "", + " [comment text indented by 5 spaces no longer belong to list]"); + + // should consider tab as 4 spaces + MT("listCommonMark_TabIndented", + "[variable-2 * list]", + "\t[variable-3 * list2]", + "", + "\t\t[variable-3 part of list2]"); + + MT("listAfterBlockquote", + "[quote"e-1 > foo]", + "[variable-2 - bar]"); + + // shouldn't create sublist if it's indented more than allowed + MT("nestedListIndentedTooMuch", + "[variable-2 - foo]", + " [variable-2 - bar]"); + + MT("listIndentedTooMuchAfterParagraph", + "foo", + " - bar"); + // Blockquote MT("blockquote", "[variable-2 * foo]", @@ -606,7 +825,7 @@ "[image&image-marker !][image&image-alt-text&link [[][image-alt-text&strong&image&link **alt text**][image&image-alt-text&link ]]][string&url (http://link.to/image.jpg)]"); MT("imageEmStrong", - "[image&image-marker !][image&image-alt-text&link [[][image-alt-text&image&strong&link **][image&image-alt-text&em&strong&link *alt text**][image&image-alt-text&em&link *][image&image-alt-text&link ]]][string&url (http://link.to/image.jpg)]"); + "[image&image-marker !][image&image-alt-text&link [[][image&image-alt-text&em&strong&link ***alt text***][image&image-alt-text&link ]]][string&url (http://link.to/image.jpg)]"); // Inline link with title MT("linkTitle", @@ -630,7 +849,12 @@ // Inline link with EmStrong MT("linkEmStrong", - "[link [[][link&strong **][link&em&strong *foo**][link&em *][link ]]][string&url (http://example.com/)] bar"); + "[link [[][link&em&strong ***foo***][link ]]][string&url (http://example.com/)] bar"); + + MT("multilineLink", + "[link [[foo]", + "[link bar]]][string&url (https://foo#_a)]", + "should not be italics") // Image with title MT("imageTitle", @@ -648,7 +872,7 @@ // regularly in text, especially in quoted material, and no space is allowed // between square brackets and parentheses (per Dingus). MT("notALink", - "[[foo]] (bar)"); + "[link [[foo]]] (bar)"); // Reference-style links MT("linkReference", @@ -664,7 +888,7 @@ // Reference-style links with EmStrong MT("linkReferenceEmStrong", - "[link [[][link&strong **][link&em&strong *foo**][link&em *][link ]]][string&url [[bar]]] hello"); + "[link [[][link&em&strong ***foo***][link ]]][string&url [[bar]]] hello"); // Reference-style links with optional space separator (per documentation) // "You can optionally use a space to separate the sets of brackets" @@ -673,7 +897,7 @@ // Should only allow a single space ("...use *a* space...") MT("linkReferenceDoubleSpace", - "[[foo]] [[bar]] hello"); + "[link [[foo]]] [link [[bar]]] hello"); // Reference-style links with implicit link name MT("linkImplicit", @@ -734,7 +958,7 @@ "[link [[foo \\]]: bar]]:] [string&url http://example.com/]"); MT("labelEscapeEnd", - "[[foo\\]]: http://example.com/"); + "\\[[foo\\]]: http://example.com/"); MT("linkWeb", "[linkfoo"); + + // Tests Emojis + + ET("emojiDefault", + "[builtin :foobar:]"); + + ET("emojiTable", + " :--:"); })(); diff --git a/public/vendor/plugins/codemirror/mode/mathematica/index.html b/public/vendor/plugins/codemirror/mode/mathematica/index.html index 57c4298531..2e5a5748fc 100644 --- a/public/vendor/plugins/codemirror/mode/mathematica/index.html +++ b/public/vendor/plugins/codemirror/mode/mathematica/index.html @@ -12,7 +12,7 @@ .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}-CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/mathematica/mathematica.js b/public/vendor/plugins/codemirror/mode/mathematica/mathematica.js
index d6977088ce..72b3492101 100644
--- a/public/vendor/plugins/codemirror/mode/mathematica/mathematica.js
+++ b/public/vendor/plugins/codemirror/mode/mathematica/mathematica.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
// Mathematica mode copyright (c) 2015 by Calin Barbat
// Based on code by Patrick Scheibe (halirutan)
@@ -71,12 +71,12 @@ CodeMirror.defineMode('mathematica', function(_config, _parserConfig) {
}
// usage
- if (stream.match(/([a-zA-Z\$]+(?:`?[a-zA-Z0-9\$])*::usage)/, true, false)) {
+ if (stream.match(/([a-zA-Z\$][a-zA-Z0-9\$]*(?:`[a-zA-Z0-9\$]+)*::usage)/, true, false)) {
return 'meta';
}
// message
- if (stream.match(/([a-zA-Z\$]+(?:`?[a-zA-Z0-9\$])*::[a-zA-Z\$][a-zA-Z0-9\$]*):?/, true, false)) {
+ if (stream.match(/([a-zA-Z\$][a-zA-Z0-9\$]*(?:`[a-zA-Z0-9\$]+)*::[a-zA-Z\$][a-zA-Z0-9\$]*):?/, true, false)) {
return 'string-2';
}
diff --git a/public/vendor/plugins/codemirror/mode/mbox/index.html b/public/vendor/plugins/codemirror/mode/mbox/index.html
index 248ea98e18..c70cf36074 100644
--- a/public/vendor/plugins/codemirror/mode/mbox/index.html
+++ b/public/vendor/plugins/codemirror/mode/mbox/index.html
@@ -9,7 +9,7 @@
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/mbox/mbox.js b/public/vendor/plugins/codemirror/mode/mbox/mbox.js
index ba2416ac81..640437ed64 100644
--- a/public/vendor/plugins/codemirror/mode/mbox/mbox.js
+++ b/public/vendor/plugins/codemirror/mode/mbox/mbox.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/public/vendor/plugins/codemirror/mode/meta.js b/public/vendor/plugins/codemirror/mode/meta.js
index eb25e242dd..e9155037a1 100644
--- a/public/vendor/plugins/codemirror/mode/meta.js
+++ b/public/vendor/plugins/codemirror/mode/meta.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -13,19 +13,19 @@
CodeMirror.modeInfo = [
{name: "APL", mime: "text/apl", mode: "apl", ext: ["dyalog", "apl"]},
- {name: "PGP", mimes: ["application/pgp", "application/pgp-keys", "application/pgp-signature"], mode: "asciiarmor", ext: ["pgp"]},
+ {name: "PGP", mimes: ["application/pgp", "application/pgp-encrypted", "application/pgp-keys", "application/pgp-signature"], mode: "asciiarmor", ext: ["asc", "pgp", "sig"]},
{name: "ASN.1", mime: "text/x-ttcn-asn", mode: "asn.1", ext: ["asn", "asn1"]},
{name: "Asterisk", mime: "text/x-asterisk", mode: "asterisk", file: /^extensions\.conf$/i},
{name: "Brainfuck", mime: "text/x-brainfuck", mode: "brainfuck", ext: ["b", "bf"]},
- {name: "C", mime: "text/x-csrc", mode: "clike", ext: ["c", "h"]},
+ {name: "C", mime: "text/x-csrc", mode: "clike", ext: ["c", "h", "ino"]},
{name: "C++", mime: "text/x-c++src", mode: "clike", ext: ["cpp", "c++", "cc", "cxx", "hpp", "h++", "hh", "hxx"], alias: ["cpp"]},
{name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ["cob", "cpy"]},
- {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"], alias: ["csharp"]},
+ {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"], alias: ["csharp", "cs"]},
{name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ["clj", "cljc", "cljx"]},
{name: "ClojureScript", mime: "text/x-clojurescript", mode: "clojure", ext: ["cljs"]},
{name: "Closure Stylesheets (GSS)", mime: "text/x-gss", mode: "css", ext: ["gss"]},
{name: "CMake", mime: "text/x-cmake", mode: "cmake", ext: ["cmake", "cmake.in"], file: /^CMakeLists.txt$/},
- {name: "CoffeeScript", mime: "text/x-coffeescript", mode: "coffeescript", ext: ["coffee"], alias: ["coffee", "coffee-script"]},
+ {name: "CoffeeScript", mimes: ["application/vnd.coffeescript", "text/coffeescript", "text/x-coffeescript"], mode: "coffeescript", ext: ["coffee"], alias: ["coffee", "coffee-script"]},
{name: "Common Lisp", mime: "text/x-common-lisp", mode: "commonlisp", ext: ["cl", "lisp", "el"], alias: ["lisp"]},
{name: "Cypher", mime: "application/x-cypher-query", mode: "cypher", ext: ["cyp", "cypher"]},
{name: "Cython", mime: "text/x-cython", mode: "python", ext: ["pyx", "pxd", "pxi"]},
@@ -47,26 +47,27 @@
{name: "Embedded Javascript", mime: "application/x-ejs", mode: "htmlembedded", ext: ["ejs"]},
{name: "Embedded Ruby", mime: "application/x-erb", mode: "htmlembedded", ext: ["erb"]},
{name: "Erlang", mime: "text/x-erlang", mode: "erlang", ext: ["erl"]},
+ {name: "Esper", mime: "text/x-esper", mode: "sql"},
{name: "Factor", mime: "text/x-factor", mode: "factor", ext: ["factor"]},
{name: "FCL", mime: "text/x-fcl", mode: "fcl"},
{name: "Forth", mime: "text/x-forth", mode: "forth", ext: ["forth", "fth", "4th"]},
- {name: "Fortran", mime: "text/x-fortran", mode: "fortran", ext: ["f", "for", "f77", "f90"]},
+ {name: "Fortran", mime: "text/x-fortran", mode: "fortran", ext: ["f", "for", "f77", "f90", "f95"]},
{name: "F#", mime: "text/x-fsharp", mode: "mllike", ext: ["fs"], alias: ["fsharp"]},
{name: "Gas", mime: "text/x-gas", mode: "gas", ext: ["s"]},
{name: "Gherkin", mime: "text/x-feature", mode: "gherkin", ext: ["feature"]},
{name: "GitHub Flavored Markdown", mime: "text/x-gfm", mode: "gfm", file: /^(readme|contributing|history).md$/i},
{name: "Go", mime: "text/x-go", mode: "go", ext: ["go"]},
- {name: "Groovy", mime: "text/x-groovy", mode: "groovy", ext: ["groovy", "gradle"]},
+ {name: "Groovy", mime: "text/x-groovy", mode: "groovy", ext: ["groovy", "gradle"], file: /^Jenkinsfile$/},
{name: "HAML", mime: "text/x-haml", mode: "haml", ext: ["haml"]},
{name: "Haskell", mime: "text/x-haskell", mode: "haskell", ext: ["hs"]},
{name: "Haskell (Literate)", mime: "text/x-literate-haskell", mode: "haskell-literate", ext: ["lhs"]},
{name: "Haxe", mime: "text/x-haxe", mode: "haxe", ext: ["hx"]},
{name: "HXML", mime: "text/x-hxml", mode: "haxe", ext: ["hxml"]},
{name: "ASP.NET", mime: "application/x-aspx", mode: "htmlembedded", ext: ["aspx"], alias: ["asp", "aspx"]},
- {name: "HTML", mime: "text/html", mode: "htmlmixed", ext: ["html", "htm"], alias: ["xhtml"]},
+ {name: "HTML", mime: "text/html", mode: "htmlmixed", ext: ["html", "htm", "handlebars", "hbs"], alias: ["xhtml"]},
{name: "HTTP", mime: "message/http", mode: "http"},
{name: "IDL", mime: "text/x-idl", mode: "idl", ext: ["pro"]},
- {name: "Jade", mime: "text/x-jade", mode: "jade", ext: ["jade"]},
+ {name: "Pug", mime: "text/x-pug", mode: "pug", ext: ["jade", "pug"], alias: ["jade"]},
{name: "Java", mime: "text/x-java", mode: "clike", ext: ["java"]},
{name: "Java Server Pages", mime: "application/x-jsp", mode: "htmlembedded", ext: ["jsp"], alias: ["jsp"]},
{name: "JavaScript", mimes: ["text/javascript", "text/ecmascript", "application/javascript", "application/x-javascript", "application/ecmascript"],
@@ -74,7 +75,7 @@
{name: "JSON", mimes: ["application/json", "application/x-json"], mode: "javascript", ext: ["json", "map"], alias: ["json5"]},
{name: "JSON-LD", mime: "application/ld+json", mode: "javascript", ext: ["jsonld"], alias: ["jsonld"]},
{name: "JSX", mime: "text/jsx", mode: "jsx", ext: ["jsx"]},
- {name: "Jinja2", mime: "null", mode: "jinja2"},
+ {name: "Jinja2", mime: "text/jinja2", mode: "jinja2", ext: ["j2", "jinja", "jinja2"]},
{name: "Julia", mime: "text/x-julia", mode: "julia", ext: ["jl"]},
{name: "Kotlin", mime: "text/x-kotlin", mode: "clike", ext: ["kt"]},
{name: "LESS", mime: "text/x-less", mode: "css", ext: ["less"]},
@@ -83,7 +84,7 @@
{name: "Markdown", mime: "text/x-markdown", mode: "markdown", ext: ["markdown", "md", "mkd"]},
{name: "mIRC", mime: "text/mirc", mode: "mirc"},
{name: "MariaDB SQL", mime: "text/x-mariadb", mode: "sql"},
- {name: "Mathematica", mime: "text/x-mathematica", mode: "mathematica", ext: ["m", "nb"]},
+ {name: "Mathematica", mime: "text/x-mathematica", mode: "mathematica", ext: ["m", "nb", "wl", "wls"]},
{name: "Modelica", mime: "text/x-modelica", mode: "modelica", ext: ["mo"]},
{name: "MUMPS", mime: "text/x-mumps", mode: "mumps", ext: ["mps"]},
{name: "MS SQL", mime: "text/x-mssql", mode: "sql"},
@@ -91,25 +92,27 @@
{name: "MySQL", mime: "text/x-mysql", mode: "sql"},
{name: "Nginx", mime: "text/x-nginx-conf", mode: "nginx", file: /nginx.*\.conf$/i},
{name: "NSIS", mime: "text/x-nsis", mode: "nsis", ext: ["nsh", "nsi"]},
- {name: "NTriples", mime: "text/n-triples", mode: "ntriples", ext: ["nt"]},
- {name: "Objective C", mime: "text/x-objectivec", mode: "clike", ext: ["m", "mm"], alias: ["objective-c", "objc"]},
+ {name: "NTriples", mimes: ["application/n-triples", "application/n-quads", "text/n-triples"],
+ mode: "ntriples", ext: ["nt", "nq"]},
+ {name: "Objective-C", mime: "text/x-objectivec", mode: "clike", ext: ["m", "mm"], alias: ["objective-c", "objc"]},
{name: "OCaml", mime: "text/x-ocaml", mode: "mllike", ext: ["ml", "mli", "mll", "mly"]},
{name: "Octave", mime: "text/x-octave", mode: "octave", ext: ["m"]},
{name: "Oz", mime: "text/x-oz", mode: "oz", ext: ["oz"]},
{name: "Pascal", mime: "text/x-pascal", mode: "pascal", ext: ["p", "pas"]},
{name: "PEG.js", mime: "null", mode: "pegjs", ext: ["jsonld"]},
{name: "Perl", mime: "text/x-perl", mode: "perl", ext: ["pl", "pm"]},
- {name: "PHP", mime: "application/x-httpd-php", mode: "php", ext: ["php", "php3", "php4", "php5", "phtml"]},
+ {name: "PHP", mimes: ["text/x-php", "application/x-httpd-php", "application/x-httpd-php-open"], mode: "php", ext: ["php", "php3", "php4", "php5", "php7", "phtml"]},
{name: "Pig", mime: "text/x-pig", mode: "pig", ext: ["pig"]},
{name: "Plain Text", mime: "text/plain", mode: "null", ext: ["txt", "text", "conf", "def", "list", "log"]},
{name: "PLSQL", mime: "text/x-plsql", mode: "sql", ext: ["pls"]},
+ {name: "PostgreSQL", mime: "text/x-pgsql", mode: "sql"},
{name: "PowerShell", mime: "application/x-powershell", mode: "powershell", ext: ["ps1", "psd1", "psm1"]},
{name: "Properties files", mime: "text/x-properties", mode: "properties", ext: ["properties", "ini", "in"], alias: ["ini", "properties"]},
{name: "ProtoBuf", mime: "text/x-protobuf", mode: "protobuf", ext: ["proto"]},
{name: "Python", mime: "text/x-python", mode: "python", ext: ["BUILD", "bzl", "py", "pyw"], file: /^(BUCK|BUILD)$/},
{name: "Puppet", mime: "text/x-puppet", mode: "puppet", ext: ["pp"]},
{name: "Q", mime: "text/x-q", mode: "q", ext: ["q"]},
- {name: "R", mime: "text/x-rsrc", mode: "r", ext: ["r"], alias: ["rscript"]},
+ {name: "R", mime: "text/x-rsrc", mode: "r", ext: ["r", "R"], alias: ["rscript"]},
{name: "reStructuredText", mime: "text/x-rst", mode: "rst", ext: ["rst"], alias: ["rst"]},
{name: "RPM Changes", mime: "text/x-rpm-changes", mode: "rpm"},
{name: "RPM Spec", mime: "text/x-rpm-spec", mode: "rpm", ext: ["spec"]},
@@ -120,21 +123,24 @@
{name: "Scala", mime: "text/x-scala", mode: "clike", ext: ["scala"]},
{name: "Scheme", mime: "text/x-scheme", mode: "scheme", ext: ["scm", "ss"]},
{name: "SCSS", mime: "text/x-scss", mode: "css", ext: ["scss"]},
- {name: "Shell", mime: "text/x-sh", mode: "shell", ext: ["sh", "ksh", "bash"], alias: ["bash", "sh", "zsh"], file: /^PKGBUILD$/},
+ {name: "Shell", mimes: ["text/x-sh", "application/x-sh"], mode: "shell", ext: ["sh", "ksh", "bash"], alias: ["bash", "sh", "zsh"], file: /^PKGBUILD$/},
{name: "Sieve", mime: "application/sieve", mode: "sieve", ext: ["siv", "sieve"]},
{name: "Slim", mimes: ["text/x-slim", "application/x-slim"], mode: "slim", ext: ["slim"]},
{name: "Smalltalk", mime: "text/x-stsrc", mode: "smalltalk", ext: ["st"]},
{name: "Smarty", mime: "text/x-smarty", mode: "smarty", ext: ["tpl"]},
{name: "Solr", mime: "text/x-solr", mode: "solr"},
+ {name: "SML", mime: "text/x-sml", mode: "mllike", ext: ["sml", "sig", "fun", "smackspec"]},
{name: "Soy", mime: "text/x-soy", mode: "soy", ext: ["soy"], alias: ["closure template"]},
{name: "SPARQL", mime: "application/sparql-query", mode: "sparql", ext: ["rq", "sparql"], alias: ["sparul"]},
{name: "Spreadsheet", mime: "text/x-spreadsheet", mode: "spreadsheet", alias: ["excel", "formula"]},
{name: "SQL", mime: "text/x-sql", mode: "sql", ext: ["sql"]},
+ {name: "SQLite", mime: "text/x-sqlite", mode: "sql"},
{name: "Squirrel", mime: "text/x-squirrel", mode: "clike", ext: ["nut"]},
+ {name: "Stylus", mime: "text/x-styl", mode: "stylus", ext: ["styl"]},
{name: "Swift", mime: "text/x-swift", mode: "swift", ext: ["swift"]},
{name: "sTeX", mime: "text/x-stex", mode: "stex"},
- {name: "LaTeX", mime: "text/x-latex", mode: "stex", ext: ["text", "ltx"], alias: ["tex"]},
- {name: "SystemVerilog", mime: "text/x-systemverilog", mode: "verilog", ext: ["v"]},
+ {name: "LaTeX", mime: "text/x-latex", mode: "stex", ext: ["text", "ltx", "tex"], alias: ["tex"]},
+ {name: "SystemVerilog", mime: "text/x-systemverilog", mode: "verilog", ext: ["v", "sv", "svh"]},
{name: "Tcl", mime: "text/x-tcl", mode: "tcl", ext: ["tcl"]},
{name: "Textile", mime: "text/x-textile", mode: "textile", ext: ["textile"]},
{name: "TiddlyWiki ", mime: "text/x-tiddlywiki", mode: "tiddlywiki"},
@@ -146,6 +152,7 @@
{name: "TTCN_CFG", mime: "text/x-ttcn-cfg", mode: "ttcn-cfg", ext: ["cfg"]},
{name: "Turtle", mime: "text/turtle", mode: "turtle", ext: ["ttl"]},
{name: "TypeScript", mime: "application/typescript", mode: "javascript", ext: ["ts"], alias: ["ts"]},
+ {name: "TypeScript-JSX", mime: "text/typescript-jsx", mode: "jsx", ext: ["tsx"], alias: ["tsx"]},
{name: "Twig", mime: "text/x-twig", mode: "twig"},
{name: "Web IDL", mime: "text/x-webidl", mode: "webidl", ext: ["webidl"]},
{name: "VB.NET", mime: "text/x-vb", mode: "vb", ext: ["vb"]},
@@ -153,10 +160,11 @@
{name: "Velocity", mime: "text/velocity", mode: "velocity", ext: ["vtl"]},
{name: "Verilog", mime: "text/x-verilog", mode: "verilog", ext: ["v"]},
{name: "VHDL", mime: "text/x-vhdl", mode: "vhdl", ext: ["vhd", "vhdl"]},
- {name: "XML", mimes: ["application/xml", "text/xml"], mode: "xml", ext: ["xml", "xsl", "xsd"], alias: ["rss", "wsdl", "xsd"]},
+ {name: "Vue.js Component", mimes: ["script/x-vue", "text/x-vue"], mode: "vue", ext: ["vue"]},
+ {name: "XML", mimes: ["application/xml", "text/xml"], mode: "xml", ext: ["xml", "xsl", "xsd", "svg"], alias: ["rss", "wsdl", "xsd"]},
{name: "XQuery", mime: "application/xquery", mode: "xquery", ext: ["xy", "xquery"]},
{name: "Yacas", mime: "text/x-yacas", mode: "yacas", ext: ["ys"]},
- {name: "YAML", mime: "text/x-yaml", mode: "yaml", ext: ["yaml", "yml"], alias: ["yml"]},
+ {name: "YAML", mimes: ["text/x-yaml", "text/yaml"], mode: "yaml", ext: ["yaml", "yml"], alias: ["yml"]},
{name: "Z80", mime: "text/x-z80", mode: "z80", ext: ["z80"]},
{name: "mscgen", mime: "text/x-mscgen", mode: "mscgen", ext: ["mscgen", "mscin", "msc"]},
{name: "xu", mime: "text/x-xu", mode: "mscgen", ext: ["xu"]},
@@ -176,6 +184,8 @@
if (info.mimes) for (var j = 0; j < info.mimes.length; j++)
if (info.mimes[j] == mime) return info;
}
+ if (/\+xml$/.test(mime)) return CodeMirror.findModeByMIME("application/xml")
+ if (/\+json$/.test(mime)) return CodeMirror.findModeByMIME("application/json")
};
CodeMirror.findModeByExtension = function(ext) {
diff --git a/public/vendor/plugins/codemirror/mode/mirc/index.html b/public/vendor/plugins/codemirror/mode/mirc/index.html
index fd2f34e4ba..98f81750fa 100644
--- a/public/vendor/plugins/codemirror/mode/mirc/index.html
+++ b/public/vendor/plugins/codemirror/mode/mirc/index.html
@@ -7,10 +7,11 @@
+
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/mirc/mirc.js b/public/vendor/plugins/codemirror/mode/mirc/mirc.js
index f0d5c6ad50..d27b0152e9 100644
--- a/public/vendor/plugins/codemirror/mode/mirc/mirc.js
+++ b/public/vendor/plugins/codemirror/mode/mirc/mirc.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
//mIRC mode by Ford_Lawnmower :: Based on Velocity mode by Steve O'Hara
@@ -130,7 +130,7 @@ CodeMirror.defineMode("mirc", function() {
}
}
else if (ch == "%") {
- stream.eatWhile(/[^,^\s^\(^\)]/);
+ stream.eatWhile(/[^,\s()]/);
state.beforeParams = true;
return "string";
}
diff --git a/public/vendor/plugins/codemirror/mode/mllike/index.html b/public/vendor/plugins/codemirror/mode/mllike/index.html
index 5923af8f87..491373171f 100644
--- a/public/vendor/plugins/codemirror/mode/mllike/index.html
+++ b/public/vendor/plugins/codemirror/mode/mllike/index.html
@@ -12,7 +12,7 @@
.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
-
CodeMirror
+ CodeMirror
- Home
@@ -132,6 +132,25 @@ let () =
(* A Hundred Lines of Caml - http://caml.inria.fr/about/taste.en.html *)
(* OCaml page on Wikipedia - http://en.wikipedia.org/wiki/OCaml *)
+
+module type S = sig type t end
+
+let x = {|
+ this is a long string
+ with many lines and stuff
+ |}
+
+let b = 0b00110
+let h = 0x123abcd
+let e = 1e-10
+let i = 1.
+let x = 30_000
+let o = 0o1234
+
+[1; 2; 3] (* lists *)
+
+1 @ 2
+1. +. 2.
F# mode
diff --git a/public/vendor/plugins/codemirror/mode/mllike/mllike.js b/public/vendor/plugins/codemirror/mode/mllike/mllike.js index bf0b8a674f..a1538f720d 100644 --- a/public/vendor/plugins/codemirror/mode/mllike/mllike.js +++ b/public/vendor/plugins/codemirror/mode/mllike/mllike.js @@ -1,5 +1,5 @@ // CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE +// Distributed under an MIT license: https://codemirror.net/LICENSE (function(mod) { if (typeof exports == "object" && typeof module == "object") // CommonJS @@ -13,31 +13,26 @@ CodeMirror.defineMode('mllike', function(_config, parserConfig) { var words = { - 'let': 'keyword', - 'rec': 'keyword', - 'in': 'keyword', - 'of': 'keyword', - 'and': 'keyword', - 'if': 'keyword', - 'then': 'keyword', - 'else': 'keyword', - 'for': 'keyword', - 'to': 'keyword', - 'while': 'keyword', + 'as': 'keyword', 'do': 'keyword', - 'done': 'keyword', + 'else': 'keyword', + 'end': 'keyword', + 'exception': 'keyword', 'fun': 'keyword', - 'function': 'keyword', - 'val': 'keyword', + 'functor': 'keyword', + 'if': 'keyword', + 'in': 'keyword', + 'include': 'keyword', + 'let': 'keyword', + 'of': 'keyword', + 'open': 'keyword', + 'rec': 'keyword', + 'struct': 'keyword', + 'then': 'keyword', 'type': 'keyword', - 'mutable': 'keyword', - 'match': 'keyword', - 'with': 'keyword', - 'try': 'keyword', - 'open': 'builtin', - 'ignore': 'builtin', - 'begin': 'keyword', - 'end': 'keyword' + 'val': 'keyword', + 'while': 'keyword', + 'with': 'keyword' }; var extraWords = parserConfig.extraWords || {}; @@ -46,6 +41,9 @@ CodeMirror.defineMode('mllike', function(_config, parserConfig) { words[prop] = parserConfig.extraWords[prop]; } } + var hintWords = []; + for (var k in words) { hintWords.push(k); } + CodeMirror.registerHelper("hintWords", "mllike", hintWords); function tokenBase(stream, state) { var ch = stream.next(); @@ -54,6 +52,13 @@ CodeMirror.defineMode('mllike', function(_config, parserConfig) { state.tokenize = tokenString; return state.tokenize(stream, state); } + if (ch === '{') { + if (stream.eat('|')) { + state.longString = true; + state.tokenize = tokenLongString; + return state.tokenize(stream, state); + } + } if (ch === '(') { if (stream.eat('*')) { state.commentLevel++; @@ -61,7 +66,7 @@ CodeMirror.defineMode('mllike', function(_config, parserConfig) { return state.tokenize(stream, state); } } - if (ch === '~') { + if (ch === '~' || ch === '?') { stream.eatWhile(/\w/); return 'variable-2'; } @@ -74,18 +79,32 @@ CodeMirror.defineMode('mllike', function(_config, parserConfig) { return 'comment'; } if (/\d/.test(ch)) { - stream.eatWhile(/[\d]/); - if (stream.eat('.')) { - stream.eatWhile(/[\d]/); + if (ch === '0' && stream.eat(/[bB]/)) { + stream.eatWhile(/[01]/); + } if (ch === '0' && stream.eat(/[xX]/)) { + stream.eatWhile(/[0-9a-fA-F]/) + } if (ch === '0' && stream.eat(/[oO]/)) { + stream.eatWhile(/[0-7]/); + } else { + stream.eatWhile(/[\d_]/); + if (stream.eat('.')) { + stream.eatWhile(/[\d]/); + } + if (stream.eat(/[eE]/)) { + stream.eatWhile(/[\d\-+]/); + } } return 'number'; } - if ( /[+\-*&%=<>!?|]/.test(ch)) { + if ( /[+\-*&%=<>!?|@\.~:]/.test(ch)) { return 'operator'; } - stream.eatWhile(/\w/); - var cur = stream.current(); - return words.hasOwnProperty(cur) ? words[cur] : 'variable'; + if (/[\w\xa1-\uffff]/.test(ch)) { + stream.eatWhile(/[\w\xa1-\uffff]/); + var cur = stream.current(); + return words.hasOwnProperty(cur) ? words[cur] : 'variable'; + } + return null } function tokenString(stream, state) { @@ -116,8 +135,20 @@ CodeMirror.defineMode('mllike', function(_config, parserConfig) { return 'comment'; } + function tokenLongString(stream, state) { + var prev, next; + while (state.longString && (next = stream.next()) != null) { + if (prev === '|' && next === '}') state.longString = false; + prev = next; + } + if (!state.longString) { + state.tokenize = tokenBase; + } + return 'string'; + } + return { - startState: function() {return {tokenize: tokenBase, commentLevel: 0};}, + startState: function() {return {tokenize: tokenBase, commentLevel: 0, longString: false};}, token: function(stream, state) { if (stream.eatSpace()) return null; return state.tokenize(stream, state); @@ -132,14 +163,64 @@ CodeMirror.defineMode('mllike', function(_config, parserConfig) { CodeMirror.defineMIME('text/x-ocaml', { name: 'mllike', extraWords: { - 'succ': 'keyword', + 'and': 'keyword', + 'assert': 'keyword', + 'begin': 'keyword', + 'class': 'keyword', + 'constraint': 'keyword', + 'done': 'keyword', + 'downto': 'keyword', + 'external': 'keyword', + 'function': 'keyword', + 'initializer': 'keyword', + 'lazy': 'keyword', + 'match': 'keyword', + 'method': 'keyword', + 'module': 'keyword', + 'mutable': 'keyword', + 'new': 'keyword', + 'nonrec': 'keyword', + 'object': 'keyword', + 'private': 'keyword', + 'sig': 'keyword', + 'to': 'keyword', + 'try': 'keyword', + 'value': 'keyword', + 'virtual': 'keyword', + 'when': 'keyword', + + // builtins + 'raise': 'builtin', + 'failwith': 'builtin', + 'true': 'builtin', + 'false': 'builtin', + + // Pervasives builtins + 'asr': 'builtin', + 'land': 'builtin', + 'lor': 'builtin', + 'lsl': 'builtin', + 'lsr': 'builtin', + 'lxor': 'builtin', + 'mod': 'builtin', + 'or': 'builtin', + + // More Pervasives + 'raise_notrace': 'builtin', 'trace': 'builtin', 'exit': 'builtin', 'print_string': 'builtin', 'print_endline': 'builtin', - 'true': 'atom', - 'false': 'atom', - 'raise': 'keyword' + + 'int': 'type', + 'float': 'type', + 'bool': 'type', + 'char': 'type', + 'string': 'type', + 'unit': 'type', + + // Modules + 'List': 'builtin' } }); @@ -147,18 +228,21 @@ CodeMirror.defineMIME('text/x-fsharp', { name: 'mllike', extraWords: { 'abstract': 'keyword', - 'as': 'keyword', 'assert': 'keyword', 'base': 'keyword', + 'begin': 'keyword', 'class': 'keyword', 'default': 'keyword', 'delegate': 'keyword', + 'do!': 'keyword', + 'done': 'keyword', 'downcast': 'keyword', 'downto': 'keyword', 'elif': 'keyword', - 'exception': 'keyword', 'extern': 'keyword', 'finally': 'keyword', + 'for': 'keyword', + 'function': 'keyword', 'global': 'keyword', 'inherit': 'keyword', 'inline': 'keyword', @@ -166,38 +250,108 @@ CodeMirror.defineMIME('text/x-fsharp', { 'internal': 'keyword', 'lazy': 'keyword', 'let!': 'keyword', - 'member' : 'keyword', + 'match': 'keyword', + 'member': 'keyword', 'module': 'keyword', + 'mutable': 'keyword', 'namespace': 'keyword', 'new': 'keyword', 'null': 'keyword', 'override': 'keyword', 'private': 'keyword', 'public': 'keyword', - 'return': 'keyword', 'return!': 'keyword', + 'return': 'keyword', 'select': 'keyword', 'static': 'keyword', - 'struct': 'keyword', + 'to': 'keyword', + 'try': 'keyword', 'upcast': 'keyword', - 'use': 'keyword', 'use!': 'keyword', - 'val': 'keyword', + 'use': 'keyword', + 'void': 'keyword', 'when': 'keyword', - 'yield': 'keyword', 'yield!': 'keyword', + 'yield': 'keyword', + // Reserved words + 'atomic': 'keyword', + 'break': 'keyword', + 'checked': 'keyword', + 'component': 'keyword', + 'const': 'keyword', + 'constraint': 'keyword', + 'constructor': 'keyword', + 'continue': 'keyword', + 'eager': 'keyword', + 'event': 'keyword', + 'external': 'keyword', + 'fixed': 'keyword', + 'method': 'keyword', + 'mixin': 'keyword', + 'object': 'keyword', + 'parallel': 'keyword', + 'process': 'keyword', + 'protected': 'keyword', + 'pure': 'keyword', + 'sealed': 'keyword', + 'tailcall': 'keyword', + 'trait': 'keyword', + 'virtual': 'keyword', + 'volatile': 'keyword', + + // builtins 'List': 'builtin', 'Seq': 'builtin', 'Map': 'builtin', 'Set': 'builtin', + 'Option': 'builtin', 'int': 'builtin', 'string': 'builtin', - 'raise': 'builtin', - 'failwith': 'builtin', 'not': 'builtin', 'true': 'builtin', - 'false': 'builtin' + 'false': 'builtin', + + 'raise': 'builtin', + 'failwith': 'builtin' + }, + slashComments: true +}); + + +CodeMirror.defineMIME('text/x-sml', { + name: 'mllike', + extraWords: { + 'abstype': 'keyword', + 'and': 'keyword', + 'andalso': 'keyword', + 'case': 'keyword', + 'datatype': 'keyword', + 'fn': 'keyword', + 'handle': 'keyword', + 'infix': 'keyword', + 'infixr': 'keyword', + 'local': 'keyword', + 'nonfix': 'keyword', + 'op': 'keyword', + 'orelse': 'keyword', + 'raise': 'keyword', + 'withtype': 'keyword', + 'eqtype': 'keyword', + 'sharing': 'keyword', + 'sig': 'keyword', + 'signature': 'keyword', + 'structure': 'keyword', + 'where': 'keyword', + 'true': 'keyword', + 'false': 'keyword', + + // types + 'int': 'builtin', + 'real': 'builtin', + 'string': 'builtin', + 'char': 'builtin', + 'bool': 'builtin' }, slashComments: true }); diff --git a/public/vendor/plugins/codemirror/mode/modelica/index.html b/public/vendor/plugins/codemirror/mode/modelica/index.html index 408c3b17e3..ed344e712f 100644 --- a/public/vendor/plugins/codemirror/mode/modelica/index.html +++ b/public/vendor/plugins/codemirror/mode/modelica/index.html @@ -12,7 +12,7 @@-CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/modelica/modelica.js b/public/vendor/plugins/codemirror/mode/modelica/modelica.js
index 77ec7a3c18..a83a4135d0 100644
--- a/public/vendor/plugins/codemirror/mode/modelica/modelica.js
+++ b/public/vendor/plugins/codemirror/mode/modelica/modelica.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
// Modelica support for CodeMirror, copyright (c) by Lennart Ochel
diff --git a/public/vendor/plugins/codemirror/mode/mscgen/index.html b/public/vendor/plugins/codemirror/mode/mscgen/index.html
index 8c28ee6200..a35ffd4320 100644
--- a/public/vendor/plugins/codemirror/mode/mscgen/index.html
+++ b/public/vendor/plugins/codemirror/mode/mscgen/index.html
@@ -9,7 +9,7 @@
-
CodeMirror
+ CodeMirror
- Home
- Manual
@@ -59,7 +59,7 @@ msc {
# Xù - expansions to MscGen to support inline expressions
# https://github.com/sverweij/mscgen_js/blob/master/wikum/xu.md
# More samples: https://sverweij.github.io/mscgen_js
-msc {
+xu {
hscale="0.8",
width="700";
diff --git a/public/vendor/plugins/codemirror/mode/mscgen/mscgen.js b/public/vendor/plugins/codemirror/mode/mscgen/mscgen.js
index d61b470652..6f4f9cd8f0 100644
--- a/public/vendor/plugins/codemirror/mode/mscgen/mscgen.js
+++ b/public/vendor/plugins/codemirror/mode/mscgen/mscgen.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
// mode(s) for the sequence chart dsl's mscgen, xù and msgenny
// For more information on mscgen, see the site of the original author:
@@ -23,6 +23,7 @@
mscgen: {
"keywords" : ["msc"],
"options" : ["hscale", "width", "arcgradient", "wordwraparcs"],
+ "constants" : ["true", "false", "on", "off"],
"attributes" : ["label", "idurl", "id", "url", "linecolor", "linecolour", "textcolor", "textcolour", "textbgcolor", "textbgcolour", "arclinecolor", "arclinecolour", "arctextcolor", "arctextcolour", "arctextbgcolor", "arctextbgcolour", "arcskip"],
"brackets" : ["\\{", "\\}"], // [ and ] are brackets too, but these get handled in with lists
"arcsWords" : ["note", "abox", "rbox", "box"],
@@ -31,9 +32,10 @@
"operators" : ["="]
},
xu: {
- "keywords" : ["msc"],
- "options" : ["hscale", "width", "arcgradient", "wordwraparcs", "watermark"],
- "attributes" : ["label", "idurl", "id", "url", "linecolor", "linecolour", "textcolor", "textcolour", "textbgcolor", "textbgcolour", "arclinecolor", "arclinecolour", "arctextcolor", "arctextcolour", "arctextbgcolor", "arctextbgcolour", "arcskip"],
+ "keywords" : ["msc", "xu"],
+ "options" : ["hscale", "width", "arcgradient", "wordwraparcs", "wordwrapentities", "watermark"],
+ "constants" : ["true", "false", "on", "off", "auto"],
+ "attributes" : ["label", "idurl", "id", "url", "linecolor", "linecolour", "textcolor", "textcolour", "textbgcolor", "textbgcolour", "arclinecolor", "arclinecolour", "arctextcolor", "arctextcolour", "arctextbgcolor", "arctextbgcolour", "arcskip", "title", "deactivate", "activate", "activation"],
"brackets" : ["\\{", "\\}"], // [ and ] are brackets too, but these get handled in with lists
"arcsWords" : ["note", "abox", "rbox", "box", "alt", "else", "opt", "break", "par", "seq", "strict", "neg", "critical", "ignore", "consider", "assert", "loop", "ref", "exc"],
"arcsOthers" : ["\\|\\|\\|", "\\.\\.\\.", "---", "--", "<->", "==", "<<=>>", "<=>", "\\.\\.", "<<>>", "::", "<:>", "->", "=>>", "=>", ">>", ":>", "<-", "<<=", "<=", "<<", "<:", "x-", "-x"],
@@ -42,7 +44,8 @@
},
msgenny: {
"keywords" : null,
- "options" : ["hscale", "width", "arcgradient", "wordwraparcs", "watermark"],
+ "options" : ["hscale", "width", "arcgradient", "wordwraparcs", "wordwrapentities", "watermark"],
+ "constants" : ["true", "false", "on", "off", "auto"],
"attributes" : null,
"brackets" : ["\\{", "\\}"],
"arcsWords" : ["note", "abox", "rbox", "box", "alt", "else", "opt", "break", "par", "seq", "strict", "neg", "critical", "ignore", "consider", "assert", "loop", "ref", "exc"],
@@ -146,6 +149,9 @@
if (!!pConfig.operators && pStream.match(wordRegexp(pConfig.operators), true, true))
return "operator";
+ if (!!pConfig.constants && pStream.match(wordRegexp(pConfig.constants), true, true))
+ return "variable";
+
/* attribute lists */
if (!pConfig.inAttributeList && !!pConfig.attributes && pStream.match(/\[/, true, true)) {
pConfig.inAttributeList = true;
diff --git a/public/vendor/plugins/codemirror/mode/mscgen/mscgen_test.js b/public/vendor/plugins/codemirror/mode/mscgen/mscgen_test.js
index e319a3997e..ff3816d853 100644
--- a/public/vendor/plugins/codemirror/mode/mscgen/mscgen_test.js
+++ b/public/vendor/plugins/codemirror/mode/mscgen/mscgen_test.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function() {
var mode = CodeMirror.getMode({indentUnit: 2}, "mscgen");
@@ -26,9 +26,18 @@
MT("xù/ msgenny keywords classify as 'base'",
"[base watermark]",
+ "[base wordwrapentities]",
"[base alt loop opt ref else break par seq assert]"
);
+ MT("xù/ msgenny constants classify as 'base'",
+ "[base auto]"
+ );
+
+ MT("mscgen constants classify as 'variable'",
+ "[variable true]", "[variable false]", "[variable on]", "[variable off]"
+ );
+
MT("mscgen options classify as keyword",
"[keyword hscale]", "[keyword width]", "[keyword arcgradient]", "[keyword wordwraparcs]"
);
@@ -63,7 +72,7 @@
MT("a typical program",
"[comment # typical mscgen program]",
"[keyword msc][base ][bracket {]",
- "[keyword wordwraparcs][operator =][string \"true\"][base , ][keyword hscale][operator =][string \"0.8\"][keyword arcgradient][operator =][base 30;]",
+ "[keyword wordwraparcs][operator =][variable true][base , ][keyword hscale][operator =][string \"0.8\"][base , ][keyword arcgradient][operator =][base 30;]",
"[base a][bracket [[][attribute label][operator =][string \"Entity A\"][bracket ]]][base ,]",
"[base b][bracket [[][attribute label][operator =][string \"Entity B\"][bracket ]]][base ,]",
"[base c][bracket [[][attribute label][operator =][string \"Entity C\"][bracket ]]][base ;]",
diff --git a/public/vendor/plugins/codemirror/mode/mscgen/msgenny_test.js b/public/vendor/plugins/codemirror/mode/mscgen/msgenny_test.js
index 80173de082..a3ed577dd2 100644
--- a/public/vendor/plugins/codemirror/mode/mscgen/msgenny_test.js
+++ b/public/vendor/plugins/codemirror/mode/mscgen/msgenny_test.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function() {
var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-msgenny");
@@ -20,9 +20,15 @@
MT("xù/ msgenny keywords classify as 'keyword'",
"[keyword watermark]",
+ "[keyword wordwrapentities]",
"[keyword alt]","[keyword loop]","[keyword opt]","[keyword ref]","[keyword else]","[keyword break]","[keyword par]","[keyword seq]","[keyword assert]"
);
+ MT("xù/ msgenny constants classify as 'variable'",
+ "[variable auto]",
+ "[variable true]", "[variable false]", "[variable on]", "[variable off]"
+ );
+
MT("mscgen options classify as keyword",
"[keyword hscale]", "[keyword width]", "[keyword arcgradient]", "[keyword wordwraparcs]"
);
@@ -56,7 +62,7 @@
MT("a typical program",
"[comment # typical msgenny program]",
- "[keyword wordwraparcs][operator =][string \"true\"][base , ][keyword hscale][operator =][string \"0.8\"][base , ][keyword arcgradient][operator =][base 30;]",
+ "[keyword wordwraparcs][operator =][variable true][base , ][keyword hscale][operator =][string \"0.8\"][base , ][keyword arcgradient][operator =][base 30;]",
"[base a : ][string \"Entity A\"][base ,]",
"[base b : Entity B,]",
"[base c : Entity C;]",
diff --git a/public/vendor/plugins/codemirror/mode/mscgen/xu_test.js b/public/vendor/plugins/codemirror/mode/mscgen/xu_test.js
index f9a50f0af2..d65a058712 100644
--- a/public/vendor/plugins/codemirror/mode/mscgen/xu_test.js
+++ b/public/vendor/plugins/codemirror/mode/mscgen/xu_test.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function() {
var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-xu");
@@ -9,7 +9,13 @@
"[keyword msc][bracket {]",
"[base ]",
"[bracket }]"
- );
+ );
+
+ MT("empty chart",
+ "[keyword xu][bracket {]",
+ "[base ]",
+ "[bracket }]"
+ );
MT("comments",
"[comment // a single line comment]",
@@ -29,6 +35,11 @@
"[keyword alt]","[keyword loop]","[keyword opt]","[keyword ref]","[keyword else]","[keyword break]","[keyword par]","[keyword seq]","[keyword assert]"
);
+ MT("xù/ msgenny constants classify as 'variable'",
+ "[variable auto]",
+ "[variable true]", "[variable false]", "[variable on]", "[variable off]"
+ );
+
MT("mscgen options classify as keyword",
"[keyword hscale]", "[keyword width]", "[keyword arcgradient]", "[keyword wordwraparcs]"
);
@@ -49,7 +60,8 @@
"[attribute id]","[attribute url]","[attribute idurl]",
"[attribute linecolor]","[attribute linecolour]","[attribute textcolor]","[attribute textcolour]","[attribute textbgcolor]","[attribute textbgcolour]",
"[attribute arclinecolor]","[attribute arclinecolour]","[attribute arctextcolor]","[attribute arctextcolour]","[attribute arctextbgcolor]","[attribute arctextbgcolour]",
- "[attribute arcskip][bracket ]]]"
+ "[attribute arcskip]","[attribute title]",
+ "[attribute activate]","[attribute deactivate]","[attribute activation][bracket ]]]"
);
MT("outside an attribute list, attributes classify as base",
@@ -57,18 +69,18 @@
"[base id]","[base url]","[base idurl]",
"[base linecolor]","[base linecolour]","[base textcolor]","[base textcolour]","[base textbgcolor]","[base textbgcolour]",
"[base arclinecolor]","[base arclinecolour]","[base arctextcolor]","[base arctextcolour]","[base arctextbgcolor]","[base arctextbgcolour]",
- "[base arcskip]"
+ "[base arcskip]", "[base title]"
);
MT("a typical program",
- "[comment # typical mscgen program]",
- "[keyword msc][base ][bracket {]",
- "[keyword wordwraparcs][operator =][string \"true\"][keyword hscale][operator =][string \"0.8\"][keyword arcgradient][operator =][base 30;]",
+ "[comment # typical xu program]",
+ "[keyword xu][base ][bracket {]",
+ "[keyword wordwraparcs][operator =][string \"true\"][base , ][keyword hscale][operator =][string \"0.8\"][base , ][keyword arcgradient][operator =][base 30, ][keyword width][operator =][variable auto][base ;]",
"[base a][bracket [[][attribute label][operator =][string \"Entity A\"][bracket ]]][base ,]",
"[base b][bracket [[][attribute label][operator =][string \"Entity B\"][bracket ]]][base ,]",
"[base c][bracket [[][attribute label][operator =][string \"Entity C\"][bracket ]]][base ;]",
"[base a ][keyword =>>][base b][bracket [[][attribute label][operator =][string \"Hello entity B\"][bracket ]]][base ;]",
- "[base a ][keyword <<][base b][bracket [[][attribute label][operator =][string \"Here's an answer dude!\"][bracket ]]][base ;]",
+ "[base a ][keyword <<][base b][bracket [[][attribute label][operator =][string \"Here's an answer dude!\"][base , ][attribute title][operator =][string \"This is a title for this message\"][bracket ]]][base ;]",
"[base c ][keyword :>][base *][bracket [[][attribute label][operator =][string \"What about me?\"][base , ][attribute textcolor][operator =][base red][bracket ]]][base ;]",
"[bracket }]"
);
diff --git a/public/vendor/plugins/codemirror/mode/mumps/index.html b/public/vendor/plugins/codemirror/mode/mumps/index.html
index b1f92c213f..9340867eef 100644
--- a/public/vendor/plugins/codemirror/mode/mumps/index.html
+++ b/public/vendor/plugins/codemirror/mode/mumps/index.html
@@ -7,9 +7,9 @@
-
+
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/mumps/mumps.js b/public/vendor/plugins/codemirror/mode/mumps/mumps.js
index 469f8c3d1c..3671c9cb36 100644
--- a/public/vendor/plugins/codemirror/mode/mumps/mumps.js
+++ b/public/vendor/plugins/codemirror/mode/mumps/mumps.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
/*
This MUMPS Language script was constructed using vbscript.js as a template.
diff --git a/public/vendor/plugins/codemirror/mode/nginx/index.html b/public/vendor/plugins/codemirror/mode/nginx/index.html
index 03cf671498..7d4ad7e630 100644
--- a/public/vendor/plugins/codemirror/mode/nginx/index.html
+++ b/public/vendor/plugins/codemirror/mode/nginx/index.html
@@ -1,4 +1,4 @@
-
+
CodeMirror: NGINX mode @@ -21,7 +21,7 @@ }-CodeMirror
+ CodeMirror
- Home
@@ -176,6 +176,6 @@ server {
var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
-
MIME types defined:
+text/nginx.MIME types defined:
diff --git a/public/vendor/plugins/codemirror/mode/nginx/nginx.js b/public/vendor/plugins/codemirror/mode/nginx/nginx.js index 00a3224922..a09f1501fa 100644 --- a/public/vendor/plugins/codemirror/mode/nginx/nginx.js +++ b/public/vendor/plugins/codemirror/mode/nginx/nginx.js @@ -1,5 +1,5 @@ // CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE +// Distributed under an MIT license: https://codemirror.net/LICENSE (function(mod) { if (typeof exports == "object" && typeof module == "object") // CommonJS diff --git a/public/vendor/plugins/codemirror/mode/nsis/index.html b/public/vendor/plugins/codemirror/mode/nsis/index.html index 2afae87f08..4bd73650af 100644 --- a/public/vendor/plugins/codemirror/mode/nsis/index.html +++ b/public/vendor/plugins/codemirror/mode/nsis/index.html @@ -13,7 +13,7 @@ .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}text/x-nginx-conf.-CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/nsis/nsis.js b/public/vendor/plugins/codemirror/mode/nsis/nsis.js
index 172207c5a1..94b8eae24d 100644
--- a/public/vendor/plugins/codemirror/mode/nsis/nsis.js
+++ b/public/vendor/plugins/codemirror/mode/nsis/nsis.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
// Author: Jan T. Sott (http://github.com/idleberg)
@@ -24,20 +24,20 @@ CodeMirror.defineSimpleMode("nsis",{
{ regex: /`(?:[^\\`]|\\.)*`?/, token: "string" },
// Compile Time Commands
- {regex: /(?:\!(include|addincludedir|addplugindir|appendfile|cd|delfile|echo|error|execute|packhdr|finalize|getdllversion|system|tempfile|warning|verbose|define|undef|insertmacro|makensis|searchparse|searchreplace))\b/, token: "keyword"},
+ {regex: /^\s*(?:\!(include|addincludedir|addplugindir|appendfile|cd|delfile|echo|error|execute|packhdr|pragma|finalize|getdllversion|gettlbversion|system|tempfile|warning|verbose|define|undef|insertmacro|macro|macroend|makensis|searchparse|searchreplace))\b/, token: "keyword"},
// Conditional Compilation
- {regex: /(?:\!(if(?:n?def)?|ifmacron?def|macro))\b/, token: "keyword", indent: true},
- {regex: /(?:\!(else|endif|macroend))\b/, token: "keyword", dedent: true},
+ {regex: /^\s*(?:\!(if(?:n?def)?|ifmacron?def|macro))\b/, token: "keyword", indent: true},
+ {regex: /^\s*(?:\!(else|endif|macroend))\b/, token: "keyword", dedent: true},
// Runtime Commands
- {regex: /\b(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetLabelAddress|GetTempFileName|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|IntCmp|IntCmpU|IntFmt|IntOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetPluginUnload|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegStr|WriteUninstaller|XPStyle)\b/, token: "keyword"},
- {regex: /\b(?:Function|PageEx|Section(?:Group)?)\b/, token: "keyword", indent: true},
- {regex: /\b(?:(Function|PageEx|Section(?:Group)?)End)\b/, token: "keyword", dedent: true},
+ {regex: /^\s*(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecShellWait|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetLabelAddress|GetTempFileName|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|Int64Cmp|Int64CmpU|Int64Fmt|IntCmp|IntCmpU|IntFmt|IntOp|IntPtrCmp|IntPtrCmpU|IntPtrOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|PEDllCharacteristics|PESubsysVer|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegMultiStr|WriteRegNone|WriteRegStr|WriteUninstaller|XPStyle)\b/, token: "keyword"},
+ {regex: /^\s*(?:Function|PageEx|Section(?:Group)?)\b/, token: "keyword", indent: true},
+ {regex: /^\s*(?:(Function|PageEx|Section(?:Group)?)End)\b/, token: "keyword", dedent: true},
// Command Options
- {regex: /\b(?:ARCHIVE|FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_NORMAL|FILE_ATTRIBUTE_OFFLINE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_TEMPORARY|HIDDEN|HKCC|HKCR|HKCU|HKDD|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_DYN_DATA|HKEY_LOCAL_MACHINE|HKEY_PERFORMANCE_DATA|HKEY_USERS|HKLM|HKPD|HKU|IDABORT|IDCANCEL|IDD_DIR|IDD_INST|IDD_INSTFILES|IDD_LICENSE|IDD_SELCOM|IDD_UNINST|IDD_VERIFY|IDIGNORE|IDNO|IDOK|IDRETRY|IDYES|MB_ABORTRETRYIGNORE|MB_DEFBUTTON1|MB_DEFBUTTON2|MB_DEFBUTTON3|MB_DEFBUTTON4|MB_ICONEXCLAMATION|MB_ICONINFORMATION|MB_ICONQUESTION|MB_ICONSTOP|MB_OK|MB_OKCANCEL|MB_RETRYCANCEL|MB_RIGHT|MB_RTLREADING|MB_SETFOREGROUND|MB_TOPMOST|MB_USERICON|MB_YESNO|MB_YESNOCANCEL|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SW_HIDE|SW_SHOWDEFAULT|SW_SHOWMAXIMIZED|SW_SHOWMINIMIZED|SW_SHOWNORMAL|SYSTEM|TEMPORARY)\b/, token: "atom"},
- {regex: /\b(?:admin|all|auto|both|bottom|bzip2|components|current|custom|directory|force|hide|highest|ifdiff|ifnewer|instfiles|lastused|leave|left|license|listonly|lzma|nevershow|none|normal|notset|right|show|silent|silentlog|textonly|top|try|un\.components|un\.custom|un\.directory|un\.instfiles|un\.license|uninstConfirm|user|Win10|Win7|Win8|WinVista|zlib)\b/, token: "builtin"},
+ {regex: /\b(?:ARCHIVE|FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_NORMAL|FILE_ATTRIBUTE_OFFLINE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_TEMPORARY|HIDDEN|HKCC|HKCR(32|64)?|HKCU(32|64)?|HKDD|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_DYN_DATA|HKEY_LOCAL_MACHINE|HKEY_PERFORMANCE_DATA|HKEY_USERS|HKLM(32|64)?|HKPD|HKU|IDABORT|IDCANCEL|IDD_DIR|IDD_INST|IDD_INSTFILES|IDD_LICENSE|IDD_SELCOM|IDD_UNINST|IDD_VERIFY|IDIGNORE|IDNO|IDOK|IDRETRY|IDYES|MB_ABORTRETRYIGNORE|MB_DEFBUTTON1|MB_DEFBUTTON2|MB_DEFBUTTON3|MB_DEFBUTTON4|MB_ICONEXCLAMATION|MB_ICONINFORMATION|MB_ICONQUESTION|MB_ICONSTOP|MB_OK|MB_OKCANCEL|MB_RETRYCANCEL|MB_RIGHT|MB_RTLREADING|MB_SETFOREGROUND|MB_TOPMOST|MB_USERICON|MB_YESNO|MB_YESNOCANCEL|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SW_HIDE|SW_SHOWDEFAULT|SW_SHOWMAXIMIZED|SW_SHOWMINIMIZED|SW_SHOWNORMAL|SYSTEM|TEMPORARY)\b/, token: "atom"},
+ {regex: /\b(?:admin|all|auto|both|bottom|bzip2|components|current|custom|directory|false|force|hide|highest|ifdiff|ifnewer|instfiles|lastused|leave|left|license|listonly|lzma|nevershow|none|normal|notset|off|on|right|show|silent|silentlog|textonly|top|true|try|un\.components|un\.custom|un\.directory|un\.instfiles|un\.license|uninstConfirm|user|Win10|Win7|Win8|WinVista|zlib)\b/, token: "builtin"},
// LogicLib.nsh
{regex: /\$\{(?:And(?:If(?:Not)?|Unless)|Break|Case(?:Else)?|Continue|Default|Do(?:Until|While)?|Else(?:If(?:Not)?|Unless)?|End(?:If|Select|Switch)|Exit(?:Do|For|While)|For(?:Each)?|If(?:Cmd|Not(?:Then)?|Then)?|Loop(?:Until|While)?|Or(?:If(?:Not)?|Unless)|Select|Switch|Unless|While)\}/, token: "variable-2", indent: true},
@@ -71,13 +71,13 @@ CodeMirror.defineSimpleMode("nsis",{
{regex: /[-+\/*=<>!]+/, token: "operator"},
// Variable
- {regex: /\$[\w]+/, token: "variable"},
+ {regex: /\$\w+/, token: "variable"},
// Constant
- {regex: /\${[\w]+}/,token: "variable-2"},
+ {regex: /\${[\w\.:-]+}/, token: "variable-2"},
// Language String
- {regex: /\$\([\w]+\)/,token: "variable-3"}
+ {regex: /\$\([\w\.:-]+\)/, token: "variable-3"}
],
comment: [
{regex: /.*?\*\//, token: "comment", next: "start"},
diff --git a/public/vendor/plugins/codemirror/mode/ntriples/index.html b/public/vendor/plugins/codemirror/mode/ntriples/index.html
index 1355e7189e..63a695d527 100644
--- a/public/vendor/plugins/codemirror/mode/ntriples/index.html
+++ b/public/vendor/plugins/codemirror/mode/ntriples/index.html
@@ -1,19 +1,20 @@
-
CodeMirror: NTriples mode +CodeMirror: N-Triples mode -- diff --git a/public/vendor/plugins/codemirror/mode/ntriples/ntriples.js b/public/vendor/plugins/codemirror/mode/ntriples/ntriples.js index 0524b1e8ab..5dd027286a 100644 --- a/public/vendor/plugins/codemirror/mode/ntriples/ntriples.js +++ b/public/vendor/plugins/codemirror/mode/ntriples/ntriples.js @@ -1,11 +1,11 @@ // CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE +// Distributed under an MIT license: https://codemirror.net/LICENSE /********************************************************** * This script provides syntax highlighting support for -* the Ntriples format. -* Ntriples format specification: -* http://www.w3.org/TR/rdf-testcases/#ntriples +* the N-Triples format. +* N-Triples format specification: +* https://www.w3.org/TR/n-triples/ ***********************************************************/ /* @@ -181,6 +181,15 @@ CodeMirror.defineMode("ntriples", function() { }; }); +// define the registered Media Type for n-triples: +// https://www.w3.org/TR/n-triples/#n-triples-mediatype +CodeMirror.defineMIME("application/n-triples", "ntriples"); + +// N-Quads is based on the N-Triples format (so same highlighting works) +// https://www.w3.org/TR/n-quads/ +CodeMirror.defineMIME("application/n-quads", "ntriples"); + +// previously used, though technically incorrect media type for n-triples CodeMirror.defineMIME("text/n-triples", "ntriples"); }); diff --git a/public/vendor/plugins/codemirror/mode/octave/index.html b/public/vendor/plugins/codemirror/mode/octave/index.html index 3490ee6371..698ae7df92 100644 --- a/public/vendor/plugins/codemirror/mode/octave/index.html +++ b/public/vendor/plugins/codemirror/mode/octave/index.html @@ -6,10 +6,11 @@ + - +NTriples mode
+N-Triples mode
+The N-Triples mode also works well with on + N-Quad documents. +
+ + +MIME types defined:
application/n-quads.-CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/octave/octave.js b/public/vendor/plugins/codemirror/mode/octave/octave.js
index a7bec030c2..33a03368fa 100644
--- a/public/vendor/plugins/codemirror/mode/octave/octave.js
+++ b/public/vendor/plugins/codemirror/mode/octave/octave.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -17,7 +17,7 @@ CodeMirror.defineMode("octave", function() {
}
var singleOperators = new RegExp("^[\\+\\-\\*/&|\\^~<>!@'\\\\]");
- var singleDelimiters = new RegExp('^[\\(\\[\\{\\},:=;]');
+ var singleDelimiters = new RegExp('^[\\(\\[\\{\\},:=;\\.]');
var doubleOperators = new RegExp("^((==)|(~=)|(<=)|(>=)|(<<)|(>>)|(\\.[\\+\\-\\*/\\^\\\\]))");
var doubleDelimiters = new RegExp("^((!=)|(\\+=)|(\\-=)|(\\*=)|(/=)|(&=)|(\\|=)|(\\^=))");
var tripleDelimiters = new RegExp("^((>>=)|(<<=))");
@@ -90,8 +90,8 @@ CodeMirror.defineMode("octave", function() {
if (stream.match(wordRegexp(['nan','NaN','inf','Inf']))) { return 'number'; };
// Handle Strings
- if (stream.match(/^"([^"]|(""))*"/)) { return 'string'; } ;
- if (stream.match(/^'([^']|(''))*'/)) { return 'string'; } ;
+ var m = stream.match(/^"(?:[^"]|"")*("|$)/) || stream.match(/^'(?:[^']|'')*('|$)/)
+ if (m) { return m[1] ? 'string' : "string error"; }
// Handle words
if (stream.match(keywords)) { return 'keyword'; } ;
@@ -126,7 +126,11 @@ CodeMirror.defineMode("octave", function() {
state.tokenize = tokenTranspose;
}
return style;
- }
+ },
+
+ lineComment: '%',
+
+ fold: 'indent'
};
});
diff --git a/public/vendor/plugins/codemirror/mode/oz/index.html b/public/vendor/plugins/codemirror/mode/oz/index.html
index febd82a59a..fb9df83e1a 100644
--- a/public/vendor/plugins/codemirror/mode/oz/index.html
+++ b/public/vendor/plugins/codemirror/mode/oz/index.html
@@ -7,12 +7,12 @@
-
+
-
CodeMirror
+ CodeMirror
- Home
- Manual
@@ -49,7 +49,7 @@ end
MIME type defined:
- - +text/x-oz.-CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/pascal/pascal.js b/public/vendor/plugins/codemirror/mode/pascal/pascal.js
index 2d0c3d4240..dc3b1a3a3e 100644
--- a/public/vendor/plugins/codemirror/mode/pascal/pascal.js
+++ b/public/vendor/plugins/codemirror/mode/pascal/pascal.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -17,9 +17,21 @@ CodeMirror.defineMode("pascal", function() {
for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
return obj;
}
- var keywords = words("and array begin case const div do downto else end file for forward integer " +
- "boolean char function goto if in label mod nil not of or packed procedure " +
- "program record repeat set string then to type until var while with");
+ var keywords = words(
+ "absolute and array asm begin case const constructor destructor div do " +
+ "downto else end file for function goto if implementation in inherited " +
+ "inline interface label mod nil not object of operator or packed procedure " +
+ "program record reintroduce repeat self set shl shr string then to type " +
+ "unit until uses var while with xor as class dispinterface except exports " +
+ "finalization finally initialization inline is library on out packed " +
+ "property raise resourcestring threadvar try absolute abstract alias " +
+ "assembler bitpacked break cdecl continue cppdecl cvar default deprecated " +
+ "dynamic enumerator experimental export external far far16 forward generic " +
+ "helper implements index interrupt iocheck local message name near " +
+ "nodefault noreturn nostackframe oldfpccall otherwise overload override " +
+ "pascal platform private protected public published read register " +
+ "reintroduce result safecall saveregisters softfloat specialize static " +
+ "stdcall stored strict unaligned unimplemented varargs virtual write");
var atoms = {"null": true};
var isOperatorChar = /[+\-*&%=<>!?|\/]/;
diff --git a/public/vendor/plugins/codemirror/mode/pegjs/index.html b/public/vendor/plugins/codemirror/mode/pegjs/index.html
index 0c74604881..9d452aa9cc 100644
--- a/public/vendor/plugins/codemirror/mode/pegjs/index.html
+++ b/public/vendor/plugins/codemirror/mode/pegjs/index.html
@@ -9,11 +9,11 @@
-
+
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/pegjs/pegjs.js b/public/vendor/plugins/codemirror/mode/pegjs/pegjs.js
index 6c72074666..19d5fa4c02 100644
--- a/public/vendor/plugins/codemirror/mode/pegjs/pegjs.js
+++ b/public/vendor/plugins/codemirror/mode/pegjs/pegjs.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/public/vendor/plugins/codemirror/mode/perl/index.html b/public/vendor/plugins/codemirror/mode/perl/index.html
index 8c1021c42b..901718a4c5 100644
--- a/public/vendor/plugins/codemirror/mode/perl/index.html
+++ b/public/vendor/plugins/codemirror/mode/perl/index.html
@@ -7,9 +7,9 @@
-
+
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/perl/perl.js b/public/vendor/plugins/codemirror/mode/perl/perl.js
index 66e4ed034c..a3101a7c5b 100644
--- a/public/vendor/plugins/codemirror/mode/perl/perl.js
+++ b/public/vendor/plugins/codemirror/mode/perl/perl.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
// CodeMirror2 mode/perl/perl.js (text/x-perl) beta 0.10 (2011-11-08)
// This is a part of CodeMirror from https://github.com/sabaca/CodeMirror_mode_perl (mail@sabaca.com)
diff --git a/public/vendor/plugins/codemirror/mode/php/index.html b/public/vendor/plugins/codemirror/mode/php/index.html
index adf6b1be22..689764146a 100644
--- a/public/vendor/plugins/codemirror/mode/php/index.html
+++ b/public/vendor/plugins/codemirror/mode/php/index.html
@@ -13,9 +13,9 @@
-
+
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/php/php.js b/public/vendor/plugins/codemirror/mode/php/php.js
index 57ba812d72..5f3a143999 100644
--- a/public/vendor/plugins/codemirror/mode/php/php.js
+++ b/public/vendor/plugins/codemirror/mode/php/php.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -151,7 +151,7 @@
};
CodeMirror.defineMode("php", function(config, parserConfig) {
- var htmlMode = CodeMirror.getMode(config, "text/html");
+ var htmlMode = CodeMirror.getMode(config, (parserConfig && parserConfig.htmlMode) || "text/html");
var phpMode = CodeMirror.getMode(config, phpConfig);
function dispatch(stream, state) {
@@ -160,7 +160,7 @@
if (!isPHP) {
if (stream.match(/^<\?\w*/)) {
state.curMode = phpMode;
- if (!state.php) state.php = CodeMirror.startState(phpMode, htmlMode.indent(state.html, ""))
+ if (!state.php) state.php = CodeMirror.startState(phpMode, htmlMode.indent(state.html, "", ""))
state.curState = state.php;
return "meta";
}
@@ -213,11 +213,11 @@
token: dispatch,
- indent: function(state, textAfter) {
+ indent: function(state, textAfter, line) {
if ((state.curMode != phpMode && /^\s*<\//.test(textAfter)) ||
(state.curMode == phpMode && /^\?>/.test(textAfter)))
- return htmlMode.indent(state.html, textAfter);
- return state.curMode.indent(state.curState, textAfter);
+ return htmlMode.indent(state.html, textAfter, line);
+ return state.curMode.indent(state.curState, textAfter, line);
},
blockCommentStart: "/*",
diff --git a/public/vendor/plugins/codemirror/mode/php/test.js b/public/vendor/plugins/codemirror/mode/php/test.js
index e2ecefc187..ec158145ce 100644
--- a/public/vendor/plugins/codemirror/mode/php/test.js
+++ b/public/vendor/plugins/codemirror/mode/php/test.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function() {
var mode = CodeMirror.getMode({indentUnit: 2}, "php");
diff --git a/public/vendor/plugins/codemirror/mode/pig/index.html b/public/vendor/plugins/codemirror/mode/pig/index.html
index ea77f70441..80fed6e1c0 100644
--- a/public/vendor/plugins/codemirror/mode/pig/index.html
+++ b/public/vendor/plugins/codemirror/mode/pig/index.html
@@ -8,7 +8,7 @@
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/pig/pig.js b/public/vendor/plugins/codemirror/mode/pig/pig.js
index 5b567272e6..3b9c7746bb 100644
--- a/public/vendor/plugins/codemirror/mode/pig/pig.js
+++ b/public/vendor/plugins/codemirror/mode/pig/pig.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
/*
* Pig Latin Mode for CodeMirror 2
diff --git a/public/vendor/plugins/codemirror/mode/powershell/index.html b/public/vendor/plugins/codemirror/mode/powershell/index.html
index 6b235df8f1..81c050a815 100644
--- a/public/vendor/plugins/codemirror/mode/powershell/index.html
+++ b/public/vendor/plugins/codemirror/mode/powershell/index.html
@@ -6,12 +6,13 @@
+
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/powershell/powershell.js b/public/vendor/plugins/codemirror/mode/powershell/powershell.js
index c443e7232d..85f89b9ec7 100644
--- a/public/vendor/plugins/codemirror/mode/powershell/powershell.js
+++ b/public/vendor/plugins/codemirror/mode/powershell/powershell.js
@@ -1,12 +1,12 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
'use strict';
if (typeof exports == 'object' && typeof module == 'object') // CommonJS
- mod(require('codemirror'));
+ mod(require('../../lib/codemirror'));
else if (typeof define == 'function' && define.amd) // AMD
- define(['codemirror'], mod);
+ define(['../../lib/codemirror'], mod);
else // Plain browser env
mod(window.CodeMirror);
})(function(CodeMirror) {
@@ -222,6 +222,8 @@ CodeMirror.defineMode('powershell', function() {
state.tokenize = tokenMultiString;
state.startQuote = quoteMatch[0];
return tokenMultiString(stream, state);
+ } else if (stream.eol()) {
+ return 'error';
} else if (stream.peek().match(/[({]/)) {
return 'punctuation';
} else if (stream.peek().match(varNames)) {
diff --git a/public/vendor/plugins/codemirror/mode/powershell/test.js b/public/vendor/plugins/codemirror/mode/powershell/test.js
index 59b8e6fca9..ba1ecf194d 100644
--- a/public/vendor/plugins/codemirror/mode/powershell/test.js
+++ b/public/vendor/plugins/codemirror/mode/powershell/test.js
@@ -1,22 +1,24 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function() {
var mode = CodeMirror.getMode({indentUnit: 2}, "powershell");
function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+ function forEach(arr, f) { for (var i = 0; i < arr.length; i++) f(arr[i], i) }
+
MT('comment', '[number 1][comment # A]');
MT('comment_multiline', '[number 1][comment <#]',
'[comment ABC]',
'[comment #>][number 2]');
- [
+ forEach([
'0', '1234',
'12kb', '12mb', '12Gb', '12Tb', '12PB', '12L', '12D', '12lkb', '12dtb',
'1.234', '1.234e56', '1.', '1.e2', '.2', '.2e34',
'1.2MB', '1.kb', '.1dTB', '1.e1gb', '.2', '.2e34',
'0x1', '0xabcdef', '0x3tb', '0xelmb'
- ].forEach(function(number) {
+ ], function(number) {
MT("number_" + number, "[number " + number + "]");
});
@@ -60,9 +62,9 @@
MT('operator_unary', "[operator +][number 3]");
MT('operator_long', "[operator -match]");
- [
+ forEach([
'(', ')', '[[', ']]', '{', '}', ',', '`', ';', '.'
- ].forEach(function(punctuation) {
+ ], function(punctuation) {
MT("punctuation_" + punctuation.replace(/^[\[\]]/,''), "[punctuation " + punctuation + "]");
});
diff --git a/public/vendor/plugins/codemirror/mode/properties/index.html b/public/vendor/plugins/codemirror/mode/properties/index.html
index f885302de2..eb49f92914 100644
--- a/public/vendor/plugins/codemirror/mode/properties/index.html
+++ b/public/vendor/plugins/codemirror/mode/properties/index.html
@@ -9,7 +9,7 @@
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/properties/properties.js b/public/vendor/plugins/codemirror/mode/properties/properties.js
index ef8bf37eea..02fd7fe5eb 100644
--- a/public/vendor/plugins/codemirror/mode/properties/properties.js
+++ b/public/vendor/plugins/codemirror/mode/properties/properties.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/public/vendor/plugins/codemirror/mode/protobuf/index.html b/public/vendor/plugins/codemirror/mode/protobuf/index.html
index cfe7b9dcd3..ee58cd9a46 100644
--- a/public/vendor/plugins/codemirror/mode/protobuf/index.html
+++ b/public/vendor/plugins/codemirror/mode/protobuf/index.html
@@ -9,7 +9,7 @@
-
CodeMirror
+ CodeMirror
- Home
@@ -54,9 +54,49 @@ message Person {
required bool deleted = 11 [default = false];
}
-
+
+
+
MIME types defined:
diff --git a/public/vendor/plugins/codemirror/mode/protobuf/protobuf.js b/public/vendor/plugins/codemirror/mode/protobuf/protobuf.js index bcae276e8d..68b240a40e 100644 --- a/public/vendor/plugins/codemirror/mode/protobuf/protobuf.js +++ b/public/vendor/plugins/codemirror/mode/protobuf/protobuf.js @@ -1,5 +1,5 @@ // CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE +// Distributed under an MIT license: https://codemirror.net/LICENSE (function(mod) { if (typeof exports == "object" && typeof module == "object") // CommonJS @@ -19,7 +19,8 @@ "package", "message", "import", "syntax", "required", "optional", "repeated", "reserved", "default", "extensions", "packed", "bool", "bytes", "double", "enum", "float", "string", - "int32", "int64", "uint32", "uint64", "sint32", "sint64", "fixed32", "fixed64", "sfixed32", "sfixed64" + "int32", "int64", "uint32", "uint64", "sint32", "sint64", "fixed32", "fixed64", "sfixed32", "sfixed64", + "option", "service", "rpc", "returns" ]; var keywords = wordRegexp(keywordArray); diff --git a/public/vendor/plugins/codemirror/mode/jade/index.html b/public/vendor/plugins/codemirror/mode/pug/index.html similarity index 76% rename from public/vendor/plugins/codemirror/mode/jade/index.html rename to public/vendor/plugins/codemirror/mode/pug/index.html index e534981b20..dfc8968dbc 100644 --- a/public/vendor/plugins/codemirror/mode/jade/index.html +++ b/public/vendor/plugins/codemirror/mode/pug/index.html @@ -1,6 +1,6 @@ -text/x-protobuf.CodeMirror: Jade Templating Mode +CodeMirror: Pug Templating Mode @@ -10,10 +10,10 @@ - - + +- diff --git a/public/vendor/plugins/codemirror/mode/jade/jade.js b/public/vendor/plugins/codemirror/mode/pug/pug.js similarity index 98% rename from public/vendor/plugins/codemirror/mode/jade/jade.js rename to public/vendor/plugins/codemirror/mode/pug/pug.js index 51ed105aca..8701b02382 100644 --- a/public/vendor/plugins/codemirror/mode/jade/jade.js +++ b/public/vendor/plugins/codemirror/mode/pug/pug.js @@ -1,5 +1,5 @@ // CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE +// Distributed under an MIT license: https://codemirror.net/LICENSE (function(mod) { if (typeof exports == "object" && typeof module == "object") // CommonJS @@ -11,7 +11,7 @@ })(function(CodeMirror) { "use strict"; -CodeMirror.defineMode('jade', function (config) { +CodeMirror.defineMode("pug", function (config) { // token types var KEYWORD = 'keyword'; var DOCTYPE = 'meta'; @@ -585,6 +585,7 @@ CodeMirror.defineMode('jade', function (config) { }; }, 'javascript', 'css', 'htmlmixed'); -CodeMirror.defineMIME('text/x-jade', 'jade'); +CodeMirror.defineMIME('text/x-pug', 'pug'); +CodeMirror.defineMIME('text/x-jade', 'pug'); }); diff --git a/public/vendor/plugins/codemirror/mode/puppet/index.html b/public/vendor/plugins/codemirror/mode/puppet/index.html index 5614c3695a..757377b1d2 100644 --- a/public/vendor/plugins/codemirror/mode/puppet/index.html +++ b/public/vendor/plugins/codemirror/mode/puppet/index.html @@ -13,7 +13,7 @@ .cm-s-default span.cm-arrow { color: red; }Jade Templating Mode
+Pug Templating Mode
-The Jade Templating Mode
+The Pug Templating Mode
Created by Forbes Lindesay. Managed as part of a Brackets extension at https://github.com/ForbesLindesay/jade-brackets.
-MIME type defined:
+text/x-jade.MIME type defined:
text/x-pug,text/x-jade.-CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/puppet/puppet.js b/public/vendor/plugins/codemirror/mode/puppet/puppet.js
index 57041300af..364934209e 100644
--- a/public/vendor/plugins/codemirror/mode/puppet/puppet.js
+++ b/public/vendor/plugins/codemirror/mode/puppet/puppet.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/public/vendor/plugins/codemirror/mode/python/index.html b/public/vendor/plugins/codemirror/mode/python/index.html
index 6116a13b6b..90ee324a21 100644
--- a/public/vendor/plugins/codemirror/mode/python/index.html
+++ b/public/vendor/plugins/codemirror/mode/python/index.html
@@ -8,9 +8,9 @@
-
+
-@@ -176,7 +185,7 @@ def pairwise_cython(double[:, ::1] X):
CodeMirror
+ CodeMirror
- Home @@ -126,6 +126,15 @@ class ExampleClass(ParentClass): def __init__(self, mixin = 'Hello'): self.mixin = mixin +# Python 3.6 f-strings (https://www.python.org/dev/peps/pep-0498/) +f'My name is {name}, my age next year is {age+1}, my anniversary is {anniversary:%A, %B %d, %Y}.' +f'He said his name is {name!r}.' +f"""He said his name is {name!r}.""" +f'{"quoted string"}' +f'{{ {4*10} }}' +f'This is an error }' +f'This is ok }}' +fr'x={4*10}\n'
Configuration Options for Python mode:
-
-
- version - 2/3 - The version of Python to recognize. Default is 2. +
- version - 2/3 - The version of Python to recognize. Default is 3.
- singleLineStringErrors - true/false - If you have a single-line string that is not terminated at the end of the line, this will show subsequent lines as errors if true, otherwise it will consider the newline as the end of the string. Default is false.
- hangingIndent - int - If you want to write long arguments to a function starting on a new line, how much that line should be indented. Defaults to one normal indentation unit.
-CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/q/q.js b/public/vendor/plugins/codemirror/mode/q/q.js
index a4af9383e7..c016a6aa65 100644
--- a/public/vendor/plugins/codemirror/mode/q/q.js
+++ b/public/vendor/plugins/codemirror/mode/q/q.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -25,7 +25,7 @@ CodeMirror.defineMode("q",function(config){
return(state.tokenize=tokenLineComment)(stream,state);
else if(c=="\\"){
if(stream.eol()||/\s/.test(stream.peek()))
- return stream.skipToEnd(),/^\\\s*$/.test(stream.current())?(state.tokenize=tokenCommentToEOF)(stream, state):state.tokenize=tokenBase,"comment";
+ return stream.skipToEnd(),/^\\\s*$/.test(stream.current())?(state.tokenize=tokenCommentToEOF)(stream):state.tokenize=tokenBase,"comment";
else
return state.tokenize=tokenBase,"builtin";
}
@@ -34,25 +34,25 @@ CodeMirror.defineMode("q",function(config){
if(c=='"')
return(state.tokenize=tokenString)(stream,state);
if(c=='`')
- return stream.eatWhile(/[A-Z|a-z|\d|_|:|\/|\.]/),"symbol";
+ return stream.eatWhile(/[A-Za-z\d_:\/.]/),"symbol";
if(("."==c&&/\d/.test(stream.peek()))||/\d/.test(c)){
var t=null;
stream.backUp(1);
- if(stream.match(/^\d{4}\.\d{2}(m|\.\d{2}([D|T](\d{2}(:\d{2}(:\d{2}(\.\d{1,9})?)?)?)?)?)/)
+ if(stream.match(/^\d{4}\.\d{2}(m|\.\d{2}([DT](\d{2}(:\d{2}(:\d{2}(\.\d{1,9})?)?)?)?)?)/)
|| stream.match(/^\d+D(\d{2}(:\d{2}(:\d{2}(\.\d{1,9})?)?)?)/)
|| stream.match(/^\d{2}:\d{2}(:\d{2}(\.\d{1,9})?)?/)
|| stream.match(/^\d+[ptuv]{1}/))
t="temporal";
else if(stream.match(/^0[NwW]{1}/)
- || stream.match(/^0x[\d|a-f|A-F]*/)
- || stream.match(/^[0|1]+[b]{1}/)
+ || stream.match(/^0x[\da-fA-F]*/)
+ || stream.match(/^[01]+[b]{1}/)
|| stream.match(/^\d+[chijn]{1}/)
|| stream.match(/-?\d*(\.\d*)?(e[+\-]?\d+)?(e|f)?/))
t="number";
return(t&&(!(c=stream.peek())||E.test(c)))?t:(stream.next(),"error");
}
- if(/[A-Z|a-z]|\./.test(c))
- return stream.eatWhile(/[A-Z|a-z|\.|_|\d]/),keywords.test(stream.current())?"keyword":"variable";
+ if(/[A-Za-z]|\./.test(c))
+ return stream.eatWhile(/[A-Za-z._\d]/),keywords.test(stream.current())?"keyword":"variable";
if(/[|/&^!+:\\\-*%$=~#;@><\.,?_\']/.test(c))
return null;
if(/[{}\(\[\]\)]/.test(c))
diff --git a/public/vendor/plugins/codemirror/mode/r/index.html b/public/vendor/plugins/codemirror/mode/r/index.html
index 6dd9634659..28192dabc5 100644
--- a/public/vendor/plugins/codemirror/mode/r/index.html
+++ b/public/vendor/plugins/codemirror/mode/r/index.html
@@ -15,7 +15,7 @@
.cm-s-default span.cm-arg-is { color: brown; }
-
CodeMirror
+ CodeMirror
- Home
@@ -31,47 +31,50 @@
R mode
- +-CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/rpm/index.html b/public/vendor/plugins/codemirror/mode/rpm/index.html
index 9a34e6dfb8..e20e53debc 100644
--- a/public/vendor/plugins/codemirror/mode/rpm/index.html
+++ b/public/vendor/plugins/codemirror/mode/rpm/index.html
@@ -8,10 +8,10 @@
-
+
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/rpm/rpm.js b/public/vendor/plugins/codemirror/mode/rpm/rpm.js
index 87cde591a3..2dece2eabd 100644
--- a/public/vendor/plugins/codemirror/mode/rpm/rpm.js
+++ b/public/vendor/plugins/codemirror/mode/rpm/rpm.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/public/vendor/plugins/codemirror/mode/rst/index.html b/public/vendor/plugins/codemirror/mode/rst/index.html
index 2902dea231..1ced39ca96 100644
--- a/public/vendor/plugins/codemirror/mode/rst/index.html
+++ b/public/vendor/plugins/codemirror/mode/rst/index.html
@@ -8,9 +8,9 @@
-
+
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/rst/rst.js b/public/vendor/plugins/codemirror/mode/rst/rst.js
index bcf110c1a5..f14eb270f9 100644
--- a/public/vendor/plugins/codemirror/mode/rst/rst.js
+++ b/public/vendor/plugins/codemirror/mode/rst/rst.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/public/vendor/plugins/codemirror/mode/ruby/index.html b/public/vendor/plugins/codemirror/mode/ruby/index.html
index 97544babc3..486b1e2454 100644
--- a/public/vendor/plugins/codemirror/mode/ruby/index.html
+++ b/public/vendor/plugins/codemirror/mode/ruby/index.html
@@ -13,7 +13,7 @@
.cm-s-default span.cm-arrow { color: red; }
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/ruby/ruby.js b/public/vendor/plugins/codemirror/mode/ruby/ruby.js
index 10cad8d9f1..dd0e603e51 100644
--- a/public/vendor/plugins/codemirror/mode/ruby/ruby.js
+++ b/public/vendor/plugins/codemirror/mode/ruby/ruby.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -28,7 +28,8 @@ CodeMirror.defineMode("ruby", function(config) {
var indentWords = wordObj(["def", "class", "case", "for", "while", "until", "module", "then",
"catch", "loop", "proc", "begin"]);
var dedentWords = wordObj(["end", "until"]);
- var matching = {"[": "]", "{": "}", "(": ")"};
+ var opening = {"[": "]", "{": "}", "(": ")"};
+ var closing = {"]": "[", "}": "{", ")": "("};
var curPunc;
function chain(newtok, stream, state) {
@@ -46,22 +47,10 @@ CodeMirror.defineMode("ruby", function(config) {
if (ch == "`" || ch == "'" || ch == '"') {
return chain(readQuoted(ch, "string", ch == '"' || ch == "`"), stream, state);
} else if (ch == "/") {
- var currentIndex = stream.current().length;
- if (stream.skipTo("/")) {
- var search_till = stream.current().length;
- stream.backUp(stream.current().length - currentIndex);
- var balance = 0; // balance brackets
- while (stream.current().length < search_till) {
- var chchr = stream.next();
- if (chchr == "(") balance += 1;
- else if (chchr == ")") balance -= 1;
- if (balance < 0) break;
- }
- stream.backUp(stream.current().length - currentIndex);
- if (balance == 0)
- return chain(readQuoted(ch, "string-2", true), stream, state);
- }
- return "operator";
+ if (regexpAhead(stream))
+ return chain(readQuoted(ch, "string-2", true), stream, state);
+ else
+ return "operator";
} else if (ch == "%") {
var style = "string", embed = true;
if (stream.eat("s")) style = "atom";
@@ -70,13 +59,13 @@ CodeMirror.defineMode("ruby", function(config) {
else if (stream.eat(/[wxq]/)) { style = "string"; embed = false; }
var delim = stream.eat(/[^\w\s=]/);
if (!delim) return "operator";
- if (matching.propertyIsEnumerable(delim)) delim = matching[delim];
+ if (opening.propertyIsEnumerable(delim)) delim = opening[delim];
return chain(readQuoted(delim, style, embed, true), stream, state);
} else if (ch == "#") {
stream.skipToEnd();
return "comment";
- } else if (ch == "<" && (m = stream.match(/^<-?[\`\"\']?([a-zA-Z_?]\w*)[\`\"\']?(?:;|$)/))) {
- return chain(readHereDoc(m[1]), stream, state);
+ } else if (ch == "<" && (m = stream.match(/^<([-~])[\`\"\']?([a-zA-Z_?]\w*)[\`\"\']?(?:;|$)/))) {
+ return chain(readHereDoc(m[2], m[1]), stream, state);
} else if (ch == "0") {
if (stream.eat("x")) stream.eatWhile(/[\da-fA-F]/);
else if (stream.eat("b")) stream.eatWhile(/[01]/);
@@ -148,6 +137,28 @@ CodeMirror.defineMode("ruby", function(config) {
}
}
+ function regexpAhead(stream) {
+ var start = stream.pos, depth = 0, next, found = false, escaped = false
+ while ((next = stream.next()) != null) {
+ if (!escaped) {
+ if ("[{(".indexOf(next) > -1) {
+ depth++
+ } else if ("]})".indexOf(next) > -1) {
+ depth--
+ if (depth < 0) break
+ } else if (next == "/" && depth == 0) {
+ found = true
+ break
+ }
+ escaped = next == "\\"
+ } else {
+ escaped = false
+ }
+ }
+ stream.backUp(stream.pos - start)
+ return found
+ }
+
function tokenBaseUntilBrace(depth) {
if (!depth) depth = 1;
return function(stream, state) {
@@ -206,8 +217,9 @@ CodeMirror.defineMode("ruby", function(config) {
return style;
};
}
- function readHereDoc(phrase) {
+ function readHereDoc(phrase, mayIndent) {
return function(stream, state) {
+ if (mayIndent) stream.eatSpace()
if (stream.match(phrase)) state.tokenize.pop();
else stream.skipToEnd();
return "string";
@@ -266,17 +278,18 @@ CodeMirror.defineMode("ruby", function(config) {
},
indent: function(state, textAfter) {
- if (state.tokenize[state.tokenize.length-1] != tokenBase) return 0;
+ if (state.tokenize[state.tokenize.length-1] != tokenBase) return CodeMirror.Pass;
var firstChar = textAfter && textAfter.charAt(0);
var ct = state.context;
- var closing = ct.type == matching[firstChar] ||
+ var closed = ct.type == closing[firstChar] ||
ct.type == "keyword" && /^(?:end|until|else|elsif|when|rescue)\b/.test(textAfter);
- return ct.indented + (closing ? 0 : config.indentUnit) +
+ return ct.indented + (closed ? 0 : config.indentUnit) +
(state.continuedLine ? config.indentUnit : 0);
},
- electricInput: /^\s*(?:end|rescue|\})$/,
- lineComment: "#"
+ electricInput: /^\s*(?:end|rescue|elsif|else|\})$/,
+ lineComment: "#",
+ fold: "indent"
};
});
diff --git a/public/vendor/plugins/codemirror/mode/ruby/test.js b/public/vendor/plugins/codemirror/mode/ruby/test.js
index cade864ff9..905c0e4849 100644
--- a/public/vendor/plugins/codemirror/mode/ruby/test.js
+++ b/public/vendor/plugins/codemirror/mode/ruby/test.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function() {
var mode = CodeMirror.getMode({indentUnit: 2}, "ruby");
@@ -11,4 +11,13 @@
MT("divide_equal_operator_no_spacing",
"[variable foo][operator /=][number 42]");
+ MT("complex_regexp",
+ "[keyword if] [variable cr] [operator =~] [string-2 /(?: \\( #{][tag RE_NOT][string-2 }\\( | #{][tag RE_NOT_PAR_OR][string-2 }* #{][tag RE_OPA_OR][string-2 } )/][variable x]")
+
+ MT("indented_heredoc",
+ "[keyword def] [def x]",
+ " [variable y] [operator =] [string <<-FOO]",
+ "[string bar]",
+ "[string FOO]",
+ "[keyword end]")
})();
diff --git a/public/vendor/plugins/codemirror/mode/rust/index.html b/public/vendor/plugins/codemirror/mode/rust/index.html
index 1fe0ad1e66..ce9789851f 100644
--- a/public/vendor/plugins/codemirror/mode/rust/index.html
+++ b/public/vendor/plugins/codemirror/mode/rust/index.html
@@ -8,9 +8,9 @@
-
+
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/rust/rust.js b/public/vendor/plugins/codemirror/mode/rust/rust.js
index 8558b53fe4..6bcfbc4446 100644
--- a/public/vendor/plugins/codemirror/mode/rust/rust.js
+++ b/public/vendor/plugins/codemirror/mode/rust/rust.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -68,4 +68,5 @@ CodeMirror.defineSimpleMode("rust",{
CodeMirror.defineMIME("text/x-rustsrc", "rust");
+CodeMirror.defineMIME("text/rust", "rust");
});
diff --git a/public/vendor/plugins/codemirror/mode/rust/test.js b/public/vendor/plugins/codemirror/mode/rust/test.js
index eb256c47e8..36c5cdeba8 100644
--- a/public/vendor/plugins/codemirror/mode/rust/test.js
+++ b/public/vendor/plugins/codemirror/mode/rust/test.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function() {
var mode = CodeMirror.getMode({indentUnit: 4}, "rust");
diff --git a/public/vendor/plugins/codemirror/mode/sas/index.html b/public/vendor/plugins/codemirror/mode/sas/index.html
index 636e06594b..b8627484e0 100644
--- a/public/vendor/plugins/codemirror/mode/sas/index.html
+++ b/public/vendor/plugins/codemirror/mode/sas/index.html
@@ -8,14 +8,14 @@
-
-
CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/sas/sas.js b/public/vendor/plugins/codemirror/mode/sas/sas.js
index fe114827c0..c6f528e0a9 100644
--- a/public/vendor/plugins/codemirror/mode/sas/sas.js
+++ b/public/vendor/plugins/codemirror/mode/sas/sas.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
// SAS mode copyright (c) 2016 Jared Dean, SAS Institute
@@ -11,7 +11,7 @@
//Definitions
-// comment -- text withing * ; or /* */
+// comment -- text within * ; or /* */
// keyword -- SAS language variable
// variable -- macro variables starts with '&' or variable formats
// variable-2 -- DATA Step, proc, or macro names
@@ -116,33 +116,21 @@
return "comment";
}
+ if (ch == "*" && stream.column() == stream.indentation()) {
+ stream.skipToEnd()
+ return "comment"
+ }
+
// DoubleOperator match
var doubleOperator = ch + stream.peek();
- // Match all line comments.
- var myString = stream.string;
- var myRegexp = /(?:^\s*|[;]\s*)(\*.*?);/ig;
- var match = myRegexp.exec(myString);
- if (match !== null) {
- if (match.index === 0 && (stream.column() !== (match.index + match[0].length - 1))) {
- stream.backUp(stream.column());
- stream.skipTo(';');
- stream.next();
- return 'comment';
- } else if (match.index + 1 < stream.column() && stream.column() < match.index + match[0].length - 1) {
- // the ';' triggers the match so move one past it to start
- // the comment block that is why match.index+1
- stream.backUp(stream.column() - match.index - 1);
- stream.skipTo(';');
- stream.next();
- return 'comment';
- }
- } else if (!state.continueString && (ch === '"' || ch === "'")) {
- // Have we found a string?
- state.continueString = ch; //save the matching quote in the state
- return "string";
- } else if (state.continueString !== null) {
- if (stream.skipTo(state.continueString)) {
+ if ((ch === '"' || ch === "'") && !state.continueString) {
+ state.continueString = ch
+ return "string"
+ } else if (state.continueString) {
+ if (state.continueString == ch) {
+ state.continueString = null;
+ } else if (stream.skipTo(state.continueString)) {
// quote found on this line
stream.next();
state.continueString = null;
@@ -187,12 +175,12 @@
if (stream.peek() === '.') stream.skipTo(' ');
state.nextword = false;
return 'variable-2';
-
}
+ word = word.toLowerCase()
// Are we in a DATA Step?
if (state.inDataStep) {
- if (word.toLowerCase() === 'run;' || stream.match(/run\s;/)) {
+ if (word === 'run;' || stream.match(/run\s;/)) {
state.inDataStep = false;
return 'builtin';
}
@@ -203,84 +191,84 @@
else return 'variable';
}
// do we have a DATA Step keyword
- if (word && words.hasOwnProperty(word.toLowerCase()) &&
- (words[word.toLowerCase()].state.indexOf("inDataStep") !== -1 ||
- words[word.toLowerCase()].state.indexOf("ALL") !== -1)) {
+ if (word && words.hasOwnProperty(word) &&
+ (words[word].state.indexOf("inDataStep") !== -1 ||
+ words[word].state.indexOf("ALL") !== -1)) {
//backup to the start of the word
if (stream.start < stream.pos)
stream.backUp(stream.pos - stream.start);
//advance the length of the word and return
for (var i = 0; i < word.length; ++i) stream.next();
- return words[word.toLowerCase()].style;
+ return words[word].style;
}
}
// Are we in an Proc statement?
if (state.inProc) {
- if (word.toLowerCase() === 'run;' || word.toLowerCase() === 'quit;') {
+ if (word === 'run;' || word === 'quit;') {
state.inProc = false;
return 'builtin';
}
// do we have a proc keyword
- if (word && words.hasOwnProperty(word.toLowerCase()) &&
- (words[word.toLowerCase()].state.indexOf("inProc") !== -1 ||
- words[word.toLowerCase()].state.indexOf("ALL") !== -1)) {
+ if (word && words.hasOwnProperty(word) &&
+ (words[word].state.indexOf("inProc") !== -1 ||
+ words[word].state.indexOf("ALL") !== -1)) {
stream.match(/[\w]+/);
return words[word].style;
}
}
// Are we in a Macro statement?
if (state.inMacro) {
- if (word.toLowerCase() === '%mend') {
+ if (word === '%mend') {
if (stream.peek() === ';') stream.next();
state.inMacro = false;
return 'builtin';
}
- if (word && words.hasOwnProperty(word.toLowerCase()) &&
- (words[word.toLowerCase()].state.indexOf("inMacro") !== -1 ||
- words[word.toLowerCase()].state.indexOf("ALL") !== -1)) {
+ if (word && words.hasOwnProperty(word) &&
+ (words[word].state.indexOf("inMacro") !== -1 ||
+ words[word].state.indexOf("ALL") !== -1)) {
stream.match(/[\w]+/);
- return words[word.toLowerCase()].style;
+ return words[word].style;
}
return 'atom';
}
// Do we have Keywords specific words?
- if (word && words.hasOwnProperty(word.toLowerCase())) {
+ if (word && words.hasOwnProperty(word)) {
// Negates the initial next()
stream.backUp(1);
// Actually move the stream
stream.match(/[\w]+/);
- if (word.toLowerCase() === 'data' && /=/.test(stream.peek()) === false) {
+ if (word === 'data' && /=/.test(stream.peek()) === false) {
state.inDataStep = true;
state.nextword = true;
return 'builtin';
}
- if (word.toLowerCase() === 'proc') {
+ if (word === 'proc') {
state.inProc = true;
state.nextword = true;
return 'builtin';
}
- if (word.toLowerCase() === '%macro') {
+ if (word === '%macro') {
state.inMacro = true;
state.nextword = true;
return 'builtin';
}
- if (/title[1-9]/i.test(word)) return 'def';
+ if (/title[1-9]/.test(word)) return 'def';
- if (word.toLowerCase() === 'footnote') {
+ if (word === 'footnote') {
stream.eat(/[1-9]/);
return 'def';
}
// Returns their value as state in the prior define methods
- if (state.inDataStep === true && words[word.toLowerCase()].state.indexOf("inDataStep") !== -1)
- return words[word.toLowerCase()].style;
- if (state.inProc === true && words[word.toLowerCase()].state.indexOf("inProc") !== -1)
- return words[word.toLowerCase()].style;
- if (state.inMacro === true && words[word.toLowerCase()].state.indexOf("inMacro") !== -1)
- return words[word.toLowerCase()].style;
- if (words[word.toLowerCase()].state.indexOf("ALL") !== -1)
- return words[word.toLowerCase()].style;
+ if (state.inDataStep === true && words[word].state.indexOf("inDataStep") !== -1)
+ return words[word].style;
+ if (state.inProc === true && words[word].state.indexOf("inProc") !== -1)
+ return words[word].style;
+ if (state.inMacro === true && words[word].state.indexOf("inMacro") !== -1)
+ return words[word].style;
+ if (words[word].state.indexOf("ALL") !== -1)
+ return words[word].style;
return null;
}
// Unrecognized syntax
diff --git a/public/vendor/plugins/codemirror/mode/sass/index.html b/public/vendor/plugins/codemirror/mode/sass/index.html
index 9f4a790221..0db5eacbcf 100644
--- a/public/vendor/plugins/codemirror/mode/sass/index.html
+++ b/public/vendor/plugins/codemirror/mode/sass/index.html
@@ -7,10 +7,11 @@
+
-
CodeMirror
+ CodeMirror
- Home
@@ -58,7 +59,8 @@ body
diff --git a/public/vendor/plugins/codemirror/mode/sass/sass.js b/public/vendor/plugins/codemirror/mode/sass/sass.js
index 6973ece292..c37ab0b28f 100644
--- a/public/vendor/plugins/codemirror/mode/sass/sass.js
+++ b/public/vendor/plugins/codemirror/mode/sass/sass.js
@@ -1,17 +1,23 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
- mod(require("../../lib/codemirror"));
+ mod(require("../../lib/codemirror"), require("../css/css"));
else if (typeof define == "function" && define.amd) // AMD
- define(["../../lib/codemirror"], mod);
+ define(["../../lib/codemirror", "../css/css"], mod);
else // Plain browser env
mod(CodeMirror);
})(function(CodeMirror) {
"use strict";
CodeMirror.defineMode("sass", function(config) {
+ var cssMode = CodeMirror.mimeModes["text/css"];
+ var propertyKeywords = cssMode.propertyKeywords || {},
+ colorKeywords = cssMode.colorKeywords || {},
+ valueKeywords = cssMode.valueKeywords || {},
+ fontProperties = cssMode.fontProperties || {};
+
function tokenRegexp(words) {
return new RegExp("^" + words.join("|"));
}
@@ -25,6 +31,12 @@ CodeMirror.defineMode("sass", function(config) {
var pseudoElementsRegexp = /^::?[a-zA-Z_][\w\-]*/;
+ var word;
+
+ function isEndLine(stream) {
+ return !stream.peek() || stream.match(/\s+$/, false);
+ }
+
function urlTokens(stream, state) {
var ch = stream.peek();
@@ -76,6 +88,9 @@ CodeMirror.defineMode("sass", function(config) {
if (endingString) {
if (nextChar !== quote && greedy) { stream.next(); }
+ if (isEndLine(stream)) {
+ state.cursorHalf = 0;
+ }
state.tokenizer = tokenBase;
return "string";
} else if (nextChar === "#" && peekChar === "{") {
@@ -147,14 +162,20 @@ CodeMirror.defineMode("sass", function(config) {
// first half i.e. before : for key-value pairs
// including selectors
+ if (ch === "-") {
+ if (stream.match(/^-\w+-/)) {
+ return "meta";
+ }
+ }
+
if (ch === ".") {
stream.next();
if (stream.match(/^[\w-]+/)) {
indent(state);
- return "atom";
+ return "qualifier";
} else if (stream.peek() === "#") {
indent(state);
- return "atom";
+ return "tag";
}
}
@@ -163,11 +184,11 @@ CodeMirror.defineMode("sass", function(config) {
// ID selectors
if (stream.match(/^[\w-]+/)) {
indent(state);
- return "atom";
+ return "builtin";
}
if (stream.peek() === "#") {
indent(state);
- return "atom";
+ return "tag";
}
}
@@ -220,37 +241,48 @@ CodeMirror.defineMode("sass", function(config) {
// Indent Directives
if (stream.match(/^@(else if|if|media|else|for|each|while|mixin|function)/)) {
indent(state);
- return "meta";
+ return "def";
}
// Other Directives
if (ch === "@") {
stream.next();
stream.eatWhile(/[\w-]/);
- return "meta";
+ return "def";
}
if (stream.eatWhile(/[\w-]/)){
if(stream.match(/ *: *[\w-\+\$#!\("']/,false)){
- return "property";
+ word = stream.current().toLowerCase();
+ var prop = state.prevProp + "-" + word;
+ if (propertyKeywords.hasOwnProperty(prop)) {
+ return "property";
+ } else if (propertyKeywords.hasOwnProperty(word)) {
+ state.prevProp = word;
+ return "property";
+ } else if (fontProperties.hasOwnProperty(word)) {
+ return "property";
+ }
+ return "tag";
}
else if(stream.match(/ *:/,false)){
indent(state);
state.cursorHalf = 1;
- return "atom";
+ state.prevProp = stream.current().toLowerCase();
+ return "property";
}
else if(stream.match(/ *,/,false)){
- return "atom";
+ return "tag";
}
else{
indent(state);
- return "atom";
+ return "tag";
}
}
if(ch === ":"){
if (stream.match(pseudoElementsRegexp)){ // could be a pseudo-element
- return "keyword";
+ return "variable-3";
}
stream.next();
state.cursorHalf=1;
@@ -264,7 +296,7 @@ CodeMirror.defineMode("sass", function(config) {
stream.next();
// Hex numbers
if (stream.match(/[0-9a-fA-F]{6}|[0-9a-fA-F]{3}/)){
- if(!stream.peek()){
+ if (isEndLine(stream)) {
state.cursorHalf = 0;
}
return "number";
@@ -273,7 +305,7 @@ CodeMirror.defineMode("sass", function(config) {
// Numbers
if (stream.match(/^-?[0-9\.]+/)){
- if(!stream.peek()){
+ if (isEndLine(stream)) {
state.cursorHalf = 0;
}
return "number";
@@ -281,14 +313,14 @@ CodeMirror.defineMode("sass", function(config) {
// Units
if (stream.match(/^(px|em|in)\b/)){
- if(!stream.peek()){
+ if (isEndLine(stream)) {
state.cursorHalf = 0;
}
return "unit";
}
if (stream.match(keywordsRegexp)){
- if(!stream.peek()){
+ if (isEndLine(stream)) {
state.cursorHalf = 0;
}
return "keyword";
@@ -296,7 +328,7 @@ CodeMirror.defineMode("sass", function(config) {
if (stream.match(/^url/) && stream.peek() === "(") {
state.tokenizer = urlTokens;
- if(!stream.peek()){
+ if (isEndLine(stream)) {
state.cursorHalf = 0;
}
return "atom";
@@ -306,23 +338,21 @@ CodeMirror.defineMode("sass", function(config) {
if (ch === "$") {
stream.next();
stream.eatWhile(/[\w-]/);
- if(!stream.peek()){
+ if (isEndLine(stream)) {
state.cursorHalf = 0;
}
- return "variable-3";
+ return "variable-2";
}
// bang character for !important, !default, etc.
if (ch === "!") {
stream.next();
- if(!stream.peek()){
- state.cursorHalf = 0;
- }
+ state.cursorHalf = 0;
return stream.match(/^[\w]+/) ? "keyword": "operator";
}
if (stream.match(opRegexp)){
- if(!stream.peek()){
+ if (isEndLine(stream)) {
state.cursorHalf = 0;
}
return "operator";
@@ -330,14 +360,24 @@ CodeMirror.defineMode("sass", function(config) {
// attributes
if (stream.eatWhile(/[\w-]/)) {
- if(!stream.peek()){
+ if (isEndLine(stream)) {
state.cursorHalf = 0;
}
- return "attribute";
+ word = stream.current().toLowerCase();
+ if (valueKeywords.hasOwnProperty(word)) {
+ return "atom";
+ } else if (colorKeywords.hasOwnProperty(word)) {
+ return "keyword";
+ } else if (propertyKeywords.hasOwnProperty(word)) {
+ state.prevProp = stream.current().toLowerCase();
+ return "property";
+ } else {
+ return "tag";
+ }
}
//stream.eatSpace();
- if(!stream.peek()){
+ if (isEndLine(stream)) {
state.cursorHalf = 0;
return null;
}
@@ -407,7 +447,7 @@ CodeMirror.defineMode("sass", function(config) {
return state.scopes[0].offset;
}
};
-});
+}, "css");
CodeMirror.defineMIME("text/x-sass", "sass");
diff --git a/public/vendor/plugins/codemirror/mode/sass/test.js b/public/vendor/plugins/codemirror/mode/sass/test.js
new file mode 100644
index 0000000000..63d79193b4
--- /dev/null
+++ b/public/vendor/plugins/codemirror/mode/sass/test.js
@@ -0,0 +1,122 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function() {
+ var mode = CodeMirror.getMode({indentUnit: 2}, "sass");
+ // Since Sass has an indent-based syntax, is almost impossible to test correctly the indentation in all cases.
+ // So disable it for tests.
+ mode.indent = undefined;
+ function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+ MT("comment",
+ "[comment // this is a comment]",
+ "[comment also this is a comment]")
+
+ MT("comment_multiline",
+ "[comment /* this is a comment]",
+ "[comment also this is a comment]")
+
+ MT("variable",
+ "[variable-2 $page-width][operator :] [number 800][unit px]")
+
+ MT("global_attributes",
+ "[tag body]",
+ " [property font][operator :]",
+ " [property family][operator :] [atom sans-serif]",
+ " [property size][operator :] [number 30][unit em]",
+ " [property weight][operator :] [atom bold]")
+
+ MT("scoped_styles",
+ "[builtin #contents]",
+ " [property width][operator :] [variable-2 $page-width]",
+ " [builtin #sidebar]",
+ " [property float][operator :] [atom right]",
+ " [property width][operator :] [variable-2 $sidebar-width]",
+ " [builtin #main]",
+ " [property width][operator :] [variable-2 $page-width] [operator -] [variable-2 $sidebar-width]",
+ " [property background][operator :] [variable-2 $primary-color]",
+ " [tag h2]",
+ " [property color][operator :] [keyword blue]")
+
+ // Sass allows to write the colon as first char instead of a "separator".
+ // :color red
+ // Not supported
+ // MT("property_syntax",
+ // "[qualifier .foo]",
+ // " [operator :][property color] [keyword red]")
+
+ MT("import",
+ "[def @import] [string \"sass/variables\"]",
+ // Probably it should parsed as above: as a string even without the " or '
+ // "[def @import] [string sass/baz]"
+ "[def @import] [tag sass][operator /][tag baz]")
+
+ MT("def",
+ "[def @if] [variable-2 $foo] [def @else]")
+
+ MT("tag_on_more_lines",
+ "[tag td],",
+ "[tag th]",
+ " [property font-family][operator :] [string \"Arial\"], [atom serif]")
+
+ MT("important",
+ "[qualifier .foo]",
+ " [property text-decoration][operator :] [atom none] [keyword !important]",
+ "[tag h1]",
+ " [property font-size][operator :] [number 2.5][unit em]")
+
+ MT("selector",
+ // SCSS doesn't highlight the :
+ // "[tag h1]:[variable-3 before],",
+ // "[tag h2]:[variable-3 before]",
+ "[tag h1][variable-3 :before],",
+ "[tag h2][variable-3 :before]",
+ " [property content][operator :] [string \"::\"]")
+
+ MT("definition_mixin_equal",
+ "[variable-2 $defined-bs-type][operator :] [atom border-box] [keyword !default]",
+ "[meta =bs][operator (][variable-2 $bs-type][operator :] [variable-2 $defined-bs-type][operator )]",
+ " [meta -webkit-][property box-sizing][operator :] [variable-2 $bs-type]",
+ " [property box-sizing][operator :] [variable-2 $bs-type]")
+
+ MT("definition_mixin_with_space",
+ "[variable-2 $defined-bs-type][operator :] [atom border-box] [keyword !default]",
+ "[def @mixin] [tag bs][operator (][variable-2 $bs-type][operator :] [variable-2 $defined-bs-type][operator )] ",
+ " [meta -moz-][property box-sizing][operator :] [variable-2 $bs-type]",
+ " [property box-sizing][operator :] [variable-2 $bs-type]")
+
+ MT("numbers_start_dot_include_plus",
+ // The % is not highlighted correctly
+ // "[meta =button-links][operator (][variable-2 $button-base][operator :] [atom darken][operator (][variable-2 $color11], [number 10][unit %][operator )][operator )]",
+ "[meta =button-links][operator (][variable-2 $button-base][operator :] [atom darken][operator (][variable-2 $color11], [number 10][operator %))]",
+ " [property padding][operator :] [number .3][unit em] [number .6][unit em]",
+ " [variable-3 +border-radius][operator (][number 8][unit px][operator )]",
+ " [property background-color][operator :] [variable-2 $button-base]")
+
+ MT("include",
+ "[qualifier .bar]",
+ " [def @include] [tag border-radius][operator (][number 8][unit px][operator )]")
+
+ MT("reference_parent",
+ "[qualifier .col]",
+ " [property clear][operator :] [atom both]",
+ // SCSS doesn't highlight the :
+ // " &:[variable-3 after]",
+ " &[variable-3 :after]",
+ " [property content][operator :] [string '']",
+ " [property clear][operator :] [atom both]")
+
+ MT("reference_parent_with_spaces",
+ "[tag section]",
+ " [property border-left][operator :] [number 20][unit px] [atom transparent] [atom solid] ",
+ " &[qualifier .section3]",
+ " [qualifier .title]",
+ " [property color][operator :] [keyword white] ",
+ " [qualifier .vermas]",
+ " [property display][operator :] [atom none]")
+
+ MT("font_face",
+ "[def @font-face]",
+ " [property font-family][operator :] [string 'icomoon']",
+ " [property src][operator :] [atom url][operator (][string fonts/icomoon.ttf][operator )]")
+})();
diff --git a/public/vendor/plugins/codemirror/mode/scheme/index.html b/public/vendor/plugins/codemirror/mode/scheme/index.html
index 04d5c6a2a3..f2eda51d66 100644
--- a/public/vendor/plugins/codemirror/mode/scheme/index.html
+++ b/public/vendor/plugins/codemirror/mode/scheme/index.html
@@ -9,7 +9,7 @@
-
CodeMirror
+ CodeMirror
- Home diff --git a/public/vendor/plugins/codemirror/mode/scheme/scheme.js b/public/vendor/plugins/codemirror/mode/scheme/scheme.js index 2234645911..56e4e332e9 100644 --- a/public/vendor/plugins/codemirror/mode/scheme/scheme.js +++ b/public/vendor/plugins/codemirror/mode/scheme/scheme.js @@ -1,5 +1,5 @@ // CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE +// Distributed under an MIT license: https://codemirror.net/LICENSE /** * Author: Koh Zi Han, based on implementation by Koh Zi Chun @@ -73,7 +73,8 @@ CodeMirror.defineMode("scheme", function () { indentStack: null, indentation: 0, mode: false, - sExprComment: false + sExprComment: false, + sExprQuote: false }; }, @@ -121,7 +122,7 @@ CodeMirror.defineMode("scheme", function () { state.sExprComment = 0; }else{ // if not we just comment the entire of the next token - stream.eatWhile(/[^/s]/); // eat non spaces + stream.eatWhile(/[^\s\(\)\[\]]/); // eat symbol atom returnType = COMMENT; break; } @@ -133,7 +134,15 @@ CodeMirror.defineMode("scheme", function () { returnType = STRING; } else if (ch == "'") { - returnType = ATOM; + if (stream.peek() == "(" || stream.peek() == "["){ + if (typeof state.sExprQuote != "number") { + state.sExprQuote = 0; + } // else already in a quoted expression + returnType = ATOM; + } else { + stream.eatWhile(/[\w_\-!$%&*+\.\/:<=>?@\^~]/); + returnType = ATOM; + } } else if (ch == '#') { if (stream.eat("|")) { // Multi-line comment state.mode = "comment"; // toggle to comment mode @@ -209,6 +218,7 @@ CodeMirror.defineMode("scheme", function () { stream.backUp(stream.current().length - 1); // undo all the eating if(typeof state.sExprComment == "number") state.sExprComment++; + if(typeof state.sExprQuote == "number") state.sExprQuote++; returnType = BRACKET; } else if (ch == ")" || ch == "]") { @@ -222,16 +232,22 @@ CodeMirror.defineMode("scheme", function () { state.sExprComment = false; // turn off s-expr commenting mode } } + if(typeof state.sExprQuote == "number"){ + if(--state.sExprQuote == 0){ + returnType = ATOM; // final closing bracket + state.sExprQuote = false; // turn off s-expr quote mode + } + } } } else { - stream.eatWhile(/[\w\$_\-!$%&*+\.\/:<=>?@\^~]/); + stream.eatWhile(/[\w_\-!$%&*+\.\/:<=>?@\^~]/); if (keywords && keywords.propertyIsEnumerable(stream.current())) { returnType = BUILTIN; } else returnType = "variable"; } } - return (typeof state.sExprComment == "number") ? COMMENT : returnType; + return (typeof state.sExprComment == "number") ? COMMENT : ((typeof state.sExprQuote == "number") ? ATOM : returnType); }, indent: function (state) { diff --git a/public/vendor/plugins/codemirror/mode/shell/index.html b/public/vendor/plugins/codemirror/mode/shell/index.html index 0b56300b12..a844c1a40b 100644 --- a/public/vendor/plugins/codemirror/mode/shell/index.html +++ b/public/vendor/plugins/codemirror/mode/shell/index.html @@ -12,7 +12,7 @@ .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
- Home
@@ -58,7 +59,8 @@ body
diff --git a/public/vendor/plugins/codemirror/mode/sass/sass.js b/public/vendor/plugins/codemirror/mode/sass/sass.js
index 6973ece292..c37ab0b28f 100644
--- a/public/vendor/plugins/codemirror/mode/sass/sass.js
+++ b/public/vendor/plugins/codemirror/mode/sass/sass.js
@@ -1,17 +1,23 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
- mod(require("../../lib/codemirror"));
+ mod(require("../../lib/codemirror"), require("../css/css"));
else if (typeof define == "function" && define.amd) // AMD
- define(["../../lib/codemirror"], mod);
+ define(["../../lib/codemirror", "../css/css"], mod);
else // Plain browser env
mod(CodeMirror);
})(function(CodeMirror) {
"use strict";
CodeMirror.defineMode("sass", function(config) {
+ var cssMode = CodeMirror.mimeModes["text/css"];
+ var propertyKeywords = cssMode.propertyKeywords || {},
+ colorKeywords = cssMode.colorKeywords || {},
+ valueKeywords = cssMode.valueKeywords || {},
+ fontProperties = cssMode.fontProperties || {};
+
function tokenRegexp(words) {
return new RegExp("^" + words.join("|"));
}
@@ -25,6 +31,12 @@ CodeMirror.defineMode("sass", function(config) {
var pseudoElementsRegexp = /^::?[a-zA-Z_][\w\-]*/;
+ var word;
+
+ function isEndLine(stream) {
+ return !stream.peek() || stream.match(/\s+$/, false);
+ }
+
function urlTokens(stream, state) {
var ch = stream.peek();
@@ -76,6 +88,9 @@ CodeMirror.defineMode("sass", function(config) {
if (endingString) {
if (nextChar !== quote && greedy) { stream.next(); }
+ if (isEndLine(stream)) {
+ state.cursorHalf = 0;
+ }
state.tokenizer = tokenBase;
return "string";
} else if (nextChar === "#" && peekChar === "{") {
@@ -147,14 +162,20 @@ CodeMirror.defineMode("sass", function(config) {
// first half i.e. before : for key-value pairs
// including selectors
+ if (ch === "-") {
+ if (stream.match(/^-\w+-/)) {
+ return "meta";
+ }
+ }
+
if (ch === ".") {
stream.next();
if (stream.match(/^[\w-]+/)) {
indent(state);
- return "atom";
+ return "qualifier";
} else if (stream.peek() === "#") {
indent(state);
- return "atom";
+ return "tag";
}
}
@@ -163,11 +184,11 @@ CodeMirror.defineMode("sass", function(config) {
// ID selectors
if (stream.match(/^[\w-]+/)) {
indent(state);
- return "atom";
+ return "builtin";
}
if (stream.peek() === "#") {
indent(state);
- return "atom";
+ return "tag";
}
}
@@ -220,37 +241,48 @@ CodeMirror.defineMode("sass", function(config) {
// Indent Directives
if (stream.match(/^@(else if|if|media|else|for|each|while|mixin|function)/)) {
indent(state);
- return "meta";
+ return "def";
}
// Other Directives
if (ch === "@") {
stream.next();
stream.eatWhile(/[\w-]/);
- return "meta";
+ return "def";
}
if (stream.eatWhile(/[\w-]/)){
if(stream.match(/ *: *[\w-\+\$#!\("']/,false)){
- return "property";
+ word = stream.current().toLowerCase();
+ var prop = state.prevProp + "-" + word;
+ if (propertyKeywords.hasOwnProperty(prop)) {
+ return "property";
+ } else if (propertyKeywords.hasOwnProperty(word)) {
+ state.prevProp = word;
+ return "property";
+ } else if (fontProperties.hasOwnProperty(word)) {
+ return "property";
+ }
+ return "tag";
}
else if(stream.match(/ *:/,false)){
indent(state);
state.cursorHalf = 1;
- return "atom";
+ state.prevProp = stream.current().toLowerCase();
+ return "property";
}
else if(stream.match(/ *,/,false)){
- return "atom";
+ return "tag";
}
else{
indent(state);
- return "atom";
+ return "tag";
}
}
if(ch === ":"){
if (stream.match(pseudoElementsRegexp)){ // could be a pseudo-element
- return "keyword";
+ return "variable-3";
}
stream.next();
state.cursorHalf=1;
@@ -264,7 +296,7 @@ CodeMirror.defineMode("sass", function(config) {
stream.next();
// Hex numbers
if (stream.match(/[0-9a-fA-F]{6}|[0-9a-fA-F]{3}/)){
- if(!stream.peek()){
+ if (isEndLine(stream)) {
state.cursorHalf = 0;
}
return "number";
@@ -273,7 +305,7 @@ CodeMirror.defineMode("sass", function(config) {
// Numbers
if (stream.match(/^-?[0-9\.]+/)){
- if(!stream.peek()){
+ if (isEndLine(stream)) {
state.cursorHalf = 0;
}
return "number";
@@ -281,14 +313,14 @@ CodeMirror.defineMode("sass", function(config) {
// Units
if (stream.match(/^(px|em|in)\b/)){
- if(!stream.peek()){
+ if (isEndLine(stream)) {
state.cursorHalf = 0;
}
return "unit";
}
if (stream.match(keywordsRegexp)){
- if(!stream.peek()){
+ if (isEndLine(stream)) {
state.cursorHalf = 0;
}
return "keyword";
@@ -296,7 +328,7 @@ CodeMirror.defineMode("sass", function(config) {
if (stream.match(/^url/) && stream.peek() === "(") {
state.tokenizer = urlTokens;
- if(!stream.peek()){
+ if (isEndLine(stream)) {
state.cursorHalf = 0;
}
return "atom";
@@ -306,23 +338,21 @@ CodeMirror.defineMode("sass", function(config) {
if (ch === "$") {
stream.next();
stream.eatWhile(/[\w-]/);
- if(!stream.peek()){
+ if (isEndLine(stream)) {
state.cursorHalf = 0;
}
- return "variable-3";
+ return "variable-2";
}
// bang character for !important, !default, etc.
if (ch === "!") {
stream.next();
- if(!stream.peek()){
- state.cursorHalf = 0;
- }
+ state.cursorHalf = 0;
return stream.match(/^[\w]+/) ? "keyword": "operator";
}
if (stream.match(opRegexp)){
- if(!stream.peek()){
+ if (isEndLine(stream)) {
state.cursorHalf = 0;
}
return "operator";
@@ -330,14 +360,24 @@ CodeMirror.defineMode("sass", function(config) {
// attributes
if (stream.eatWhile(/[\w-]/)) {
- if(!stream.peek()){
+ if (isEndLine(stream)) {
state.cursorHalf = 0;
}
- return "attribute";
+ word = stream.current().toLowerCase();
+ if (valueKeywords.hasOwnProperty(word)) {
+ return "atom";
+ } else if (colorKeywords.hasOwnProperty(word)) {
+ return "keyword";
+ } else if (propertyKeywords.hasOwnProperty(word)) {
+ state.prevProp = stream.current().toLowerCase();
+ return "property";
+ } else {
+ return "tag";
+ }
}
//stream.eatSpace();
- if(!stream.peek()){
+ if (isEndLine(stream)) {
state.cursorHalf = 0;
return null;
}
@@ -407,7 +447,7 @@ CodeMirror.defineMode("sass", function(config) {
return state.scopes[0].offset;
}
};
-});
+}, "css");
CodeMirror.defineMIME("text/x-sass", "sass");
diff --git a/public/vendor/plugins/codemirror/mode/sass/test.js b/public/vendor/plugins/codemirror/mode/sass/test.js
new file mode 100644
index 0000000000..63d79193b4
--- /dev/null
+++ b/public/vendor/plugins/codemirror/mode/sass/test.js
@@ -0,0 +1,122 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function() {
+ var mode = CodeMirror.getMode({indentUnit: 2}, "sass");
+ // Since Sass has an indent-based syntax, is almost impossible to test correctly the indentation in all cases.
+ // So disable it for tests.
+ mode.indent = undefined;
+ function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+ MT("comment",
+ "[comment // this is a comment]",
+ "[comment also this is a comment]")
+
+ MT("comment_multiline",
+ "[comment /* this is a comment]",
+ "[comment also this is a comment]")
+
+ MT("variable",
+ "[variable-2 $page-width][operator :] [number 800][unit px]")
+
+ MT("global_attributes",
+ "[tag body]",
+ " [property font][operator :]",
+ " [property family][operator :] [atom sans-serif]",
+ " [property size][operator :] [number 30][unit em]",
+ " [property weight][operator :] [atom bold]")
+
+ MT("scoped_styles",
+ "[builtin #contents]",
+ " [property width][operator :] [variable-2 $page-width]",
+ " [builtin #sidebar]",
+ " [property float][operator :] [atom right]",
+ " [property width][operator :] [variable-2 $sidebar-width]",
+ " [builtin #main]",
+ " [property width][operator :] [variable-2 $page-width] [operator -] [variable-2 $sidebar-width]",
+ " [property background][operator :] [variable-2 $primary-color]",
+ " [tag h2]",
+ " [property color][operator :] [keyword blue]")
+
+ // Sass allows to write the colon as first char instead of a "separator".
+ // :color red
+ // Not supported
+ // MT("property_syntax",
+ // "[qualifier .foo]",
+ // " [operator :][property color] [keyword red]")
+
+ MT("import",
+ "[def @import] [string \"sass/variables\"]",
+ // Probably it should parsed as above: as a string even without the " or '
+ // "[def @import] [string sass/baz]"
+ "[def @import] [tag sass][operator /][tag baz]")
+
+ MT("def",
+ "[def @if] [variable-2 $foo] [def @else]")
+
+ MT("tag_on_more_lines",
+ "[tag td],",
+ "[tag th]",
+ " [property font-family][operator :] [string \"Arial\"], [atom serif]")
+
+ MT("important",
+ "[qualifier .foo]",
+ " [property text-decoration][operator :] [atom none] [keyword !important]",
+ "[tag h1]",
+ " [property font-size][operator :] [number 2.5][unit em]")
+
+ MT("selector",
+ // SCSS doesn't highlight the :
+ // "[tag h1]:[variable-3 before],",
+ // "[tag h2]:[variable-3 before]",
+ "[tag h1][variable-3 :before],",
+ "[tag h2][variable-3 :before]",
+ " [property content][operator :] [string \"::\"]")
+
+ MT("definition_mixin_equal",
+ "[variable-2 $defined-bs-type][operator :] [atom border-box] [keyword !default]",
+ "[meta =bs][operator (][variable-2 $bs-type][operator :] [variable-2 $defined-bs-type][operator )]",
+ " [meta -webkit-][property box-sizing][operator :] [variable-2 $bs-type]",
+ " [property box-sizing][operator :] [variable-2 $bs-type]")
+
+ MT("definition_mixin_with_space",
+ "[variable-2 $defined-bs-type][operator :] [atom border-box] [keyword !default]",
+ "[def @mixin] [tag bs][operator (][variable-2 $bs-type][operator :] [variable-2 $defined-bs-type][operator )] ",
+ " [meta -moz-][property box-sizing][operator :] [variable-2 $bs-type]",
+ " [property box-sizing][operator :] [variable-2 $bs-type]")
+
+ MT("numbers_start_dot_include_plus",
+ // The % is not highlighted correctly
+ // "[meta =button-links][operator (][variable-2 $button-base][operator :] [atom darken][operator (][variable-2 $color11], [number 10][unit %][operator )][operator )]",
+ "[meta =button-links][operator (][variable-2 $button-base][operator :] [atom darken][operator (][variable-2 $color11], [number 10][operator %))]",
+ " [property padding][operator :] [number .3][unit em] [number .6][unit em]",
+ " [variable-3 +border-radius][operator (][number 8][unit px][operator )]",
+ " [property background-color][operator :] [variable-2 $button-base]")
+
+ MT("include",
+ "[qualifier .bar]",
+ " [def @include] [tag border-radius][operator (][number 8][unit px][operator )]")
+
+ MT("reference_parent",
+ "[qualifier .col]",
+ " [property clear][operator :] [atom both]",
+ // SCSS doesn't highlight the :
+ // " &:[variable-3 after]",
+ " &[variable-3 :after]",
+ " [property content][operator :] [string '']",
+ " [property clear][operator :] [atom both]")
+
+ MT("reference_parent_with_spaces",
+ "[tag section]",
+ " [property border-left][operator :] [number 20][unit px] [atom transparent] [atom solid] ",
+ " &[qualifier .section3]",
+ " [qualifier .title]",
+ " [property color][operator :] [keyword white] ",
+ " [qualifier .vermas]",
+ " [property display][operator :] [atom none]")
+
+ MT("font_face",
+ "[def @font-face]",
+ " [property font-family][operator :] [string 'icomoon']",
+ " [property src][operator :] [atom url][operator (][string fonts/icomoon.ttf][operator )]")
+})();
diff --git a/public/vendor/plugins/codemirror/mode/scheme/index.html b/public/vendor/plugins/codemirror/mode/scheme/index.html
index 04d5c6a2a3..f2eda51d66 100644
--- a/public/vendor/plugins/codemirror/mode/scheme/index.html
+++ b/public/vendor/plugins/codemirror/mode/scheme/index.html
@@ -9,7 +9,7 @@
- Home
diff --git a/public/vendor/plugins/codemirror/mode/sas/sas.js b/public/vendor/plugins/codemirror/mode/sas/sas.js
index fe114827c0..c6f528e0a9 100644
--- a/public/vendor/plugins/codemirror/mode/sas/sas.js
+++ b/public/vendor/plugins/codemirror/mode/sas/sas.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
// SAS mode copyright (c) 2016 Jared Dean, SAS Institute
@@ -11,7 +11,7 @@
//Definitions
-// comment -- text withing * ; or /* */
+// comment -- text within * ; or /* */
// keyword -- SAS language variable
// variable -- macro variables starts with '&' or variable formats
// variable-2 -- DATA Step, proc, or macro names
@@ -116,33 +116,21 @@
return "comment";
}
+ if (ch == "*" && stream.column() == stream.indentation()) {
+ stream.skipToEnd()
+ return "comment"
+ }
+
// DoubleOperator match
var doubleOperator = ch + stream.peek();
- // Match all line comments.
- var myString = stream.string;
- var myRegexp = /(?:^\s*|[;]\s*)(\*.*?);/ig;
- var match = myRegexp.exec(myString);
- if (match !== null) {
- if (match.index === 0 && (stream.column() !== (match.index + match[0].length - 1))) {
- stream.backUp(stream.column());
- stream.skipTo(';');
- stream.next();
- return 'comment';
- } else if (match.index + 1 < stream.column() && stream.column() < match.index + match[0].length - 1) {
- // the ';' triggers the match so move one past it to start
- // the comment block that is why match.index+1
- stream.backUp(stream.column() - match.index - 1);
- stream.skipTo(';');
- stream.next();
- return 'comment';
- }
- } else if (!state.continueString && (ch === '"' || ch === "'")) {
- // Have we found a string?
- state.continueString = ch; //save the matching quote in the state
- return "string";
- } else if (state.continueString !== null) {
- if (stream.skipTo(state.continueString)) {
+ if ((ch === '"' || ch === "'") && !state.continueString) {
+ state.continueString = ch
+ return "string"
+ } else if (state.continueString) {
+ if (state.continueString == ch) {
+ state.continueString = null;
+ } else if (stream.skipTo(state.continueString)) {
// quote found on this line
stream.next();
state.continueString = null;
@@ -187,12 +175,12 @@
if (stream.peek() === '.') stream.skipTo(' ');
state.nextword = false;
return 'variable-2';
-
}
+ word = word.toLowerCase()
// Are we in a DATA Step?
if (state.inDataStep) {
- if (word.toLowerCase() === 'run;' || stream.match(/run\s;/)) {
+ if (word === 'run;' || stream.match(/run\s;/)) {
state.inDataStep = false;
return 'builtin';
}
@@ -203,84 +191,84 @@
else return 'variable';
}
// do we have a DATA Step keyword
- if (word && words.hasOwnProperty(word.toLowerCase()) &&
- (words[word.toLowerCase()].state.indexOf("inDataStep") !== -1 ||
- words[word.toLowerCase()].state.indexOf("ALL") !== -1)) {
+ if (word && words.hasOwnProperty(word) &&
+ (words[word].state.indexOf("inDataStep") !== -1 ||
+ words[word].state.indexOf("ALL") !== -1)) {
//backup to the start of the word
if (stream.start < stream.pos)
stream.backUp(stream.pos - stream.start);
//advance the length of the word and return
for (var i = 0; i < word.length; ++i) stream.next();
- return words[word.toLowerCase()].style;
+ return words[word].style;
}
}
// Are we in an Proc statement?
if (state.inProc) {
- if (word.toLowerCase() === 'run;' || word.toLowerCase() === 'quit;') {
+ if (word === 'run;' || word === 'quit;') {
state.inProc = false;
return 'builtin';
}
// do we have a proc keyword
- if (word && words.hasOwnProperty(word.toLowerCase()) &&
- (words[word.toLowerCase()].state.indexOf("inProc") !== -1 ||
- words[word.toLowerCase()].state.indexOf("ALL") !== -1)) {
+ if (word && words.hasOwnProperty(word) &&
+ (words[word].state.indexOf("inProc") !== -1 ||
+ words[word].state.indexOf("ALL") !== -1)) {
stream.match(/[\w]+/);
return words[word].style;
}
}
// Are we in a Macro statement?
if (state.inMacro) {
- if (word.toLowerCase() === '%mend') {
+ if (word === '%mend') {
if (stream.peek() === ';') stream.next();
state.inMacro = false;
return 'builtin';
}
- if (word && words.hasOwnProperty(word.toLowerCase()) &&
- (words[word.toLowerCase()].state.indexOf("inMacro") !== -1 ||
- words[word.toLowerCase()].state.indexOf("ALL") !== -1)) {
+ if (word && words.hasOwnProperty(word) &&
+ (words[word].state.indexOf("inMacro") !== -1 ||
+ words[word].state.indexOf("ALL") !== -1)) {
stream.match(/[\w]+/);
- return words[word.toLowerCase()].style;
+ return words[word].style;
}
return 'atom';
}
// Do we have Keywords specific words?
- if (word && words.hasOwnProperty(word.toLowerCase())) {
+ if (word && words.hasOwnProperty(word)) {
// Negates the initial next()
stream.backUp(1);
// Actually move the stream
stream.match(/[\w]+/);
- if (word.toLowerCase() === 'data' && /=/.test(stream.peek()) === false) {
+ if (word === 'data' && /=/.test(stream.peek()) === false) {
state.inDataStep = true;
state.nextword = true;
return 'builtin';
}
- if (word.toLowerCase() === 'proc') {
+ if (word === 'proc') {
state.inProc = true;
state.nextword = true;
return 'builtin';
}
- if (word.toLowerCase() === '%macro') {
+ if (word === '%macro') {
state.inMacro = true;
state.nextword = true;
return 'builtin';
}
- if (/title[1-9]/i.test(word)) return 'def';
+ if (/title[1-9]/.test(word)) return 'def';
- if (word.toLowerCase() === 'footnote') {
+ if (word === 'footnote') {
stream.eat(/[1-9]/);
return 'def';
}
// Returns their value as state in the prior define methods
- if (state.inDataStep === true && words[word.toLowerCase()].state.indexOf("inDataStep") !== -1)
- return words[word.toLowerCase()].style;
- if (state.inProc === true && words[word.toLowerCase()].state.indexOf("inProc") !== -1)
- return words[word.toLowerCase()].style;
- if (state.inMacro === true && words[word.toLowerCase()].state.indexOf("inMacro") !== -1)
- return words[word.toLowerCase()].style;
- if (words[word.toLowerCase()].state.indexOf("ALL") !== -1)
- return words[word.toLowerCase()].style;
+ if (state.inDataStep === true && words[word].state.indexOf("inDataStep") !== -1)
+ return words[word].style;
+ if (state.inProc === true && words[word].state.indexOf("inProc") !== -1)
+ return words[word].style;
+ if (state.inMacro === true && words[word].state.indexOf("inMacro") !== -1)
+ return words[word].style;
+ if (words[word].state.indexOf("ALL") !== -1)
+ return words[word].style;
return null;
}
// Unrecognized syntax
diff --git a/public/vendor/plugins/codemirror/mode/sass/index.html b/public/vendor/plugins/codemirror/mode/sass/index.html
index 9f4a790221..0db5eacbcf 100644
--- a/public/vendor/plugins/codemirror/mode/sass/index.html
+++ b/public/vendor/plugins/codemirror/mode/sass/index.html
@@ -7,10 +7,11 @@
+
- Home
diff --git a/public/vendor/plugins/codemirror/mode/rust/rust.js b/public/vendor/plugins/codemirror/mode/rust/rust.js
index 8558b53fe4..6bcfbc4446 100644
--- a/public/vendor/plugins/codemirror/mode/rust/rust.js
+++ b/public/vendor/plugins/codemirror/mode/rust/rust.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -68,4 +68,5 @@ CodeMirror.defineSimpleMode("rust",{
CodeMirror.defineMIME("text/x-rustsrc", "rust");
+CodeMirror.defineMIME("text/rust", "rust");
});
diff --git a/public/vendor/plugins/codemirror/mode/rust/test.js b/public/vendor/plugins/codemirror/mode/rust/test.js
index eb256c47e8..36c5cdeba8 100644
--- a/public/vendor/plugins/codemirror/mode/rust/test.js
+++ b/public/vendor/plugins/codemirror/mode/rust/test.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function() {
var mode = CodeMirror.getMode({indentUnit: 4}, "rust");
diff --git a/public/vendor/plugins/codemirror/mode/sas/index.html b/public/vendor/plugins/codemirror/mode/sas/index.html
index 636e06594b..b8627484e0 100644
--- a/public/vendor/plugins/codemirror/mode/sas/index.html
+++ b/public/vendor/plugins/codemirror/mode/sas/index.html
@@ -8,14 +8,14 @@
-
- Home
diff --git a/public/vendor/plugins/codemirror/mode/ruby/ruby.js b/public/vendor/plugins/codemirror/mode/ruby/ruby.js
index 10cad8d9f1..dd0e603e51 100644
--- a/public/vendor/plugins/codemirror/mode/ruby/ruby.js
+++ b/public/vendor/plugins/codemirror/mode/ruby/ruby.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -28,7 +28,8 @@ CodeMirror.defineMode("ruby", function(config) {
var indentWords = wordObj(["def", "class", "case", "for", "while", "until", "module", "then",
"catch", "loop", "proc", "begin"]);
var dedentWords = wordObj(["end", "until"]);
- var matching = {"[": "]", "{": "}", "(": ")"};
+ var opening = {"[": "]", "{": "}", "(": ")"};
+ var closing = {"]": "[", "}": "{", ")": "("};
var curPunc;
function chain(newtok, stream, state) {
@@ -46,22 +47,10 @@ CodeMirror.defineMode("ruby", function(config) {
if (ch == "`" || ch == "'" || ch == '"') {
return chain(readQuoted(ch, "string", ch == '"' || ch == "`"), stream, state);
} else if (ch == "/") {
- var currentIndex = stream.current().length;
- if (stream.skipTo("/")) {
- var search_till = stream.current().length;
- stream.backUp(stream.current().length - currentIndex);
- var balance = 0; // balance brackets
- while (stream.current().length < search_till) {
- var chchr = stream.next();
- if (chchr == "(") balance += 1;
- else if (chchr == ")") balance -= 1;
- if (balance < 0) break;
- }
- stream.backUp(stream.current().length - currentIndex);
- if (balance == 0)
- return chain(readQuoted(ch, "string-2", true), stream, state);
- }
- return "operator";
+ if (regexpAhead(stream))
+ return chain(readQuoted(ch, "string-2", true), stream, state);
+ else
+ return "operator";
} else if (ch == "%") {
var style = "string", embed = true;
if (stream.eat("s")) style = "atom";
@@ -70,13 +59,13 @@ CodeMirror.defineMode("ruby", function(config) {
else if (stream.eat(/[wxq]/)) { style = "string"; embed = false; }
var delim = stream.eat(/[^\w\s=]/);
if (!delim) return "operator";
- if (matching.propertyIsEnumerable(delim)) delim = matching[delim];
+ if (opening.propertyIsEnumerable(delim)) delim = opening[delim];
return chain(readQuoted(delim, style, embed, true), stream, state);
} else if (ch == "#") {
stream.skipToEnd();
return "comment";
- } else if (ch == "<" && (m = stream.match(/^<-?[\`\"\']?([a-zA-Z_?]\w*)[\`\"\']?(?:;|$)/))) {
- return chain(readHereDoc(m[1]), stream, state);
+ } else if (ch == "<" && (m = stream.match(/^<([-~])[\`\"\']?([a-zA-Z_?]\w*)[\`\"\']?(?:;|$)/))) {
+ return chain(readHereDoc(m[2], m[1]), stream, state);
} else if (ch == "0") {
if (stream.eat("x")) stream.eatWhile(/[\da-fA-F]/);
else if (stream.eat("b")) stream.eatWhile(/[01]/);
@@ -148,6 +137,28 @@ CodeMirror.defineMode("ruby", function(config) {
}
}
+ function regexpAhead(stream) {
+ var start = stream.pos, depth = 0, next, found = false, escaped = false
+ while ((next = stream.next()) != null) {
+ if (!escaped) {
+ if ("[{(".indexOf(next) > -1) {
+ depth++
+ } else if ("]})".indexOf(next) > -1) {
+ depth--
+ if (depth < 0) break
+ } else if (next == "/" && depth == 0) {
+ found = true
+ break
+ }
+ escaped = next == "\\"
+ } else {
+ escaped = false
+ }
+ }
+ stream.backUp(stream.pos - start)
+ return found
+ }
+
function tokenBaseUntilBrace(depth) {
if (!depth) depth = 1;
return function(stream, state) {
@@ -206,8 +217,9 @@ CodeMirror.defineMode("ruby", function(config) {
return style;
};
}
- function readHereDoc(phrase) {
+ function readHereDoc(phrase, mayIndent) {
return function(stream, state) {
+ if (mayIndent) stream.eatSpace()
if (stream.match(phrase)) state.tokenize.pop();
else stream.skipToEnd();
return "string";
@@ -266,17 +278,18 @@ CodeMirror.defineMode("ruby", function(config) {
},
indent: function(state, textAfter) {
- if (state.tokenize[state.tokenize.length-1] != tokenBase) return 0;
+ if (state.tokenize[state.tokenize.length-1] != tokenBase) return CodeMirror.Pass;
var firstChar = textAfter && textAfter.charAt(0);
var ct = state.context;
- var closing = ct.type == matching[firstChar] ||
+ var closed = ct.type == closing[firstChar] ||
ct.type == "keyword" && /^(?:end|until|else|elsif|when|rescue)\b/.test(textAfter);
- return ct.indented + (closing ? 0 : config.indentUnit) +
+ return ct.indented + (closed ? 0 : config.indentUnit) +
(state.continuedLine ? config.indentUnit : 0);
},
- electricInput: /^\s*(?:end|rescue|\})$/,
- lineComment: "#"
+ electricInput: /^\s*(?:end|rescue|elsif|else|\})$/,
+ lineComment: "#",
+ fold: "indent"
};
});
diff --git a/public/vendor/plugins/codemirror/mode/ruby/test.js b/public/vendor/plugins/codemirror/mode/ruby/test.js
index cade864ff9..905c0e4849 100644
--- a/public/vendor/plugins/codemirror/mode/ruby/test.js
+++ b/public/vendor/plugins/codemirror/mode/ruby/test.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function() {
var mode = CodeMirror.getMode({indentUnit: 2}, "ruby");
@@ -11,4 +11,13 @@
MT("divide_equal_operator_no_spacing",
"[variable foo][operator /=][number 42]");
+ MT("complex_regexp",
+ "[keyword if] [variable cr] [operator =~] [string-2 /(?: \\( #{][tag RE_NOT][string-2 }\\( | #{][tag RE_NOT_PAR_OR][string-2 }* #{][tag RE_OPA_OR][string-2 } )/][variable x]")
+
+ MT("indented_heredoc",
+ "[keyword def] [def x]",
+ " [variable y] [operator =] [string <<-FOO]",
+ "[string bar]",
+ "[string FOO]",
+ "[keyword end]")
})();
diff --git a/public/vendor/plugins/codemirror/mode/rust/index.html b/public/vendor/plugins/codemirror/mode/rust/index.html
index 1fe0ad1e66..ce9789851f 100644
--- a/public/vendor/plugins/codemirror/mode/rust/index.html
+++ b/public/vendor/plugins/codemirror/mode/rust/index.html
@@ -8,9 +8,9 @@
-
+
- Home
diff --git a/public/vendor/plugins/codemirror/mode/rst/rst.js b/public/vendor/plugins/codemirror/mode/rst/rst.js
index bcf110c1a5..f14eb270f9 100644
--- a/public/vendor/plugins/codemirror/mode/rst/rst.js
+++ b/public/vendor/plugins/codemirror/mode/rst/rst.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/public/vendor/plugins/codemirror/mode/ruby/index.html b/public/vendor/plugins/codemirror/mode/ruby/index.html
index 97544babc3..486b1e2454 100644
--- a/public/vendor/plugins/codemirror/mode/ruby/index.html
+++ b/public/vendor/plugins/codemirror/mode/ruby/index.html
@@ -13,7 +13,7 @@
.cm-s-default span.cm-arrow { color: red; }
- Home
diff --git a/public/vendor/plugins/codemirror/mode/rpm/rpm.js b/public/vendor/plugins/codemirror/mode/rpm/rpm.js
index 87cde591a3..2dece2eabd 100644
--- a/public/vendor/plugins/codemirror/mode/rpm/rpm.js
+++ b/public/vendor/plugins/codemirror/mode/rpm/rpm.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/public/vendor/plugins/codemirror/mode/rst/index.html b/public/vendor/plugins/codemirror/mode/rst/index.html
index 2902dea231..1ced39ca96 100644
--- a/public/vendor/plugins/codemirror/mode/rst/index.html
+++ b/public/vendor/plugins/codemirror/mode/rst/index.html
@@ -8,9 +8,9 @@
-
+
- Home
diff --git a/public/vendor/plugins/codemirror/mode/rpm/index.html b/public/vendor/plugins/codemirror/mode/rpm/index.html
index 9a34e6dfb8..e20e53debc 100644
--- a/public/vendor/plugins/codemirror/mode/rpm/index.html
+++ b/public/vendor/plugins/codemirror/mode/rpm/index.html
@@ -8,10 +8,10 @@
-
+
- Home
@@ -31,47 +31,50 @@
- Home
diff --git a/public/vendor/plugins/codemirror/mode/puppet/puppet.js b/public/vendor/plugins/codemirror/mode/puppet/puppet.js
index 57041300af..364934209e 100644
--- a/public/vendor/plugins/codemirror/mode/puppet/puppet.js
+++ b/public/vendor/plugins/codemirror/mode/puppet/puppet.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/public/vendor/plugins/codemirror/mode/python/index.html b/public/vendor/plugins/codemirror/mode/python/index.html
index 6116a13b6b..90ee324a21 100644
--- a/public/vendor/plugins/codemirror/mode/python/index.html
+++ b/public/vendor/plugins/codemirror/mode/python/index.html
@@ -8,9 +8,9 @@
-
+
- Home
@@ -54,9 +54,49 @@ message Person {
required bool deleted = 11 [default = false];
}
-
+
+
+
- Home
diff --git a/public/vendor/plugins/codemirror/mode/properties/properties.js b/public/vendor/plugins/codemirror/mode/properties/properties.js
index ef8bf37eea..02fd7fe5eb 100644
--- a/public/vendor/plugins/codemirror/mode/properties/properties.js
+++ b/public/vendor/plugins/codemirror/mode/properties/properties.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/public/vendor/plugins/codemirror/mode/protobuf/index.html b/public/vendor/plugins/codemirror/mode/protobuf/index.html
index cfe7b9dcd3..ee58cd9a46 100644
--- a/public/vendor/plugins/codemirror/mode/protobuf/index.html
+++ b/public/vendor/plugins/codemirror/mode/protobuf/index.html
@@ -9,7 +9,7 @@
- Home
diff --git a/public/vendor/plugins/codemirror/mode/powershell/powershell.js b/public/vendor/plugins/codemirror/mode/powershell/powershell.js
index c443e7232d..85f89b9ec7 100644
--- a/public/vendor/plugins/codemirror/mode/powershell/powershell.js
+++ b/public/vendor/plugins/codemirror/mode/powershell/powershell.js
@@ -1,12 +1,12 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
'use strict';
if (typeof exports == 'object' && typeof module == 'object') // CommonJS
- mod(require('codemirror'));
+ mod(require('../../lib/codemirror'));
else if (typeof define == 'function' && define.amd) // AMD
- define(['codemirror'], mod);
+ define(['../../lib/codemirror'], mod);
else // Plain browser env
mod(window.CodeMirror);
})(function(CodeMirror) {
@@ -222,6 +222,8 @@ CodeMirror.defineMode('powershell', function() {
state.tokenize = tokenMultiString;
state.startQuote = quoteMatch[0];
return tokenMultiString(stream, state);
+ } else if (stream.eol()) {
+ return 'error';
} else if (stream.peek().match(/[({]/)) {
return 'punctuation';
} else if (stream.peek().match(varNames)) {
diff --git a/public/vendor/plugins/codemirror/mode/powershell/test.js b/public/vendor/plugins/codemirror/mode/powershell/test.js
index 59b8e6fca9..ba1ecf194d 100644
--- a/public/vendor/plugins/codemirror/mode/powershell/test.js
+++ b/public/vendor/plugins/codemirror/mode/powershell/test.js
@@ -1,22 +1,24 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function() {
var mode = CodeMirror.getMode({indentUnit: 2}, "powershell");
function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+ function forEach(arr, f) { for (var i = 0; i < arr.length; i++) f(arr[i], i) }
+
MT('comment', '[number 1][comment # A]');
MT('comment_multiline', '[number 1][comment <#]',
'[comment ABC]',
'[comment #>][number 2]');
- [
+ forEach([
'0', '1234',
'12kb', '12mb', '12Gb', '12Tb', '12PB', '12L', '12D', '12lkb', '12dtb',
'1.234', '1.234e56', '1.', '1.e2', '.2', '.2e34',
'1.2MB', '1.kb', '.1dTB', '1.e1gb', '.2', '.2e34',
'0x1', '0xabcdef', '0x3tb', '0xelmb'
- ].forEach(function(number) {
+ ], function(number) {
MT("number_" + number, "[number " + number + "]");
});
@@ -60,9 +62,9 @@
MT('operator_unary', "[operator +][number 3]");
MT('operator_long', "[operator -match]");
- [
+ forEach([
'(', ')', '[[', ']]', '{', '}', ',', '`', ';', '.'
- ].forEach(function(punctuation) {
+ ], function(punctuation) {
MT("punctuation_" + punctuation.replace(/^[\[\]]/,''), "[punctuation " + punctuation + "]");
});
diff --git a/public/vendor/plugins/codemirror/mode/properties/index.html b/public/vendor/plugins/codemirror/mode/properties/index.html
index f885302de2..eb49f92914 100644
--- a/public/vendor/plugins/codemirror/mode/properties/index.html
+++ b/public/vendor/plugins/codemirror/mode/properties/index.html
@@ -9,7 +9,7 @@
- Home
diff --git a/public/vendor/plugins/codemirror/mode/pig/pig.js b/public/vendor/plugins/codemirror/mode/pig/pig.js
index 5b567272e6..3b9c7746bb 100644
--- a/public/vendor/plugins/codemirror/mode/pig/pig.js
+++ b/public/vendor/plugins/codemirror/mode/pig/pig.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
/*
* Pig Latin Mode for CodeMirror 2
diff --git a/public/vendor/plugins/codemirror/mode/powershell/index.html b/public/vendor/plugins/codemirror/mode/powershell/index.html
index 6b235df8f1..81c050a815 100644
--- a/public/vendor/plugins/codemirror/mode/powershell/index.html
+++ b/public/vendor/plugins/codemirror/mode/powershell/index.html
@@ -6,12 +6,13 @@
+
- Home
diff --git a/public/vendor/plugins/codemirror/mode/php/php.js b/public/vendor/plugins/codemirror/mode/php/php.js
index 57ba812d72..5f3a143999 100644
--- a/public/vendor/plugins/codemirror/mode/php/php.js
+++ b/public/vendor/plugins/codemirror/mode/php/php.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -151,7 +151,7 @@
};
CodeMirror.defineMode("php", function(config, parserConfig) {
- var htmlMode = CodeMirror.getMode(config, "text/html");
+ var htmlMode = CodeMirror.getMode(config, (parserConfig && parserConfig.htmlMode) || "text/html");
var phpMode = CodeMirror.getMode(config, phpConfig);
function dispatch(stream, state) {
@@ -160,7 +160,7 @@
if (!isPHP) {
if (stream.match(/^<\?\w*/)) {
state.curMode = phpMode;
- if (!state.php) state.php = CodeMirror.startState(phpMode, htmlMode.indent(state.html, ""))
+ if (!state.php) state.php = CodeMirror.startState(phpMode, htmlMode.indent(state.html, "", ""))
state.curState = state.php;
return "meta";
}
@@ -213,11 +213,11 @@
token: dispatch,
- indent: function(state, textAfter) {
+ indent: function(state, textAfter, line) {
if ((state.curMode != phpMode && /^\s*<\//.test(textAfter)) ||
(state.curMode == phpMode && /^\?>/.test(textAfter)))
- return htmlMode.indent(state.html, textAfter);
- return state.curMode.indent(state.curState, textAfter);
+ return htmlMode.indent(state.html, textAfter, line);
+ return state.curMode.indent(state.curState, textAfter, line);
},
blockCommentStart: "/*",
diff --git a/public/vendor/plugins/codemirror/mode/php/test.js b/public/vendor/plugins/codemirror/mode/php/test.js
index e2ecefc187..ec158145ce 100644
--- a/public/vendor/plugins/codemirror/mode/php/test.js
+++ b/public/vendor/plugins/codemirror/mode/php/test.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function() {
var mode = CodeMirror.getMode({indentUnit: 2}, "php");
diff --git a/public/vendor/plugins/codemirror/mode/pig/index.html b/public/vendor/plugins/codemirror/mode/pig/index.html
index ea77f70441..80fed6e1c0 100644
--- a/public/vendor/plugins/codemirror/mode/pig/index.html
+++ b/public/vendor/plugins/codemirror/mode/pig/index.html
@@ -8,7 +8,7 @@
- Home
diff --git a/public/vendor/plugins/codemirror/mode/perl/perl.js b/public/vendor/plugins/codemirror/mode/perl/perl.js
index 66e4ed034c..a3101a7c5b 100644
--- a/public/vendor/plugins/codemirror/mode/perl/perl.js
+++ b/public/vendor/plugins/codemirror/mode/perl/perl.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
// CodeMirror2 mode/perl/perl.js (text/x-perl) beta 0.10 (2011-11-08)
// This is a part of CodeMirror from https://github.com/sabaca/CodeMirror_mode_perl (mail@sabaca.com)
diff --git a/public/vendor/plugins/codemirror/mode/php/index.html b/public/vendor/plugins/codemirror/mode/php/index.html
index adf6b1be22..689764146a 100644
--- a/public/vendor/plugins/codemirror/mode/php/index.html
+++ b/public/vendor/plugins/codemirror/mode/php/index.html
@@ -13,9 +13,9 @@
-
+
- Home
diff --git a/public/vendor/plugins/codemirror/mode/pegjs/pegjs.js b/public/vendor/plugins/codemirror/mode/pegjs/pegjs.js
index 6c72074666..19d5fa4c02 100644
--- a/public/vendor/plugins/codemirror/mode/pegjs/pegjs.js
+++ b/public/vendor/plugins/codemirror/mode/pegjs/pegjs.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/public/vendor/plugins/codemirror/mode/perl/index.html b/public/vendor/plugins/codemirror/mode/perl/index.html
index 8c1021c42b..901718a4c5 100644
--- a/public/vendor/plugins/codemirror/mode/perl/index.html
+++ b/public/vendor/plugins/codemirror/mode/perl/index.html
@@ -7,9 +7,9 @@
-
+
- Home
diff --git a/public/vendor/plugins/codemirror/mode/pascal/pascal.js b/public/vendor/plugins/codemirror/mode/pascal/pascal.js
index 2d0c3d4240..dc3b1a3a3e 100644
--- a/public/vendor/plugins/codemirror/mode/pascal/pascal.js
+++ b/public/vendor/plugins/codemirror/mode/pascal/pascal.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -17,9 +17,21 @@ CodeMirror.defineMode("pascal", function() {
for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
return obj;
}
- var keywords = words("and array begin case const div do downto else end file for forward integer " +
- "boolean char function goto if in label mod nil not of or packed procedure " +
- "program record repeat set string then to type until var while with");
+ var keywords = words(
+ "absolute and array asm begin case const constructor destructor div do " +
+ "downto else end file for function goto if implementation in inherited " +
+ "inline interface label mod nil not object of operator or packed procedure " +
+ "program record reintroduce repeat self set shl shr string then to type " +
+ "unit until uses var while with xor as class dispinterface except exports " +
+ "finalization finally initialization inline is library on out packed " +
+ "property raise resourcestring threadvar try absolute abstract alias " +
+ "assembler bitpacked break cdecl continue cppdecl cvar default deprecated " +
+ "dynamic enumerator experimental export external far far16 forward generic " +
+ "helper implements index interrupt iocheck local message name near " +
+ "nodefault noreturn nostackframe oldfpccall otherwise overload override " +
+ "pascal platform private protected public published read register " +
+ "reintroduce result safecall saveregisters softfloat specialize static " +
+ "stdcall stored strict unaligned unimplemented varargs virtual write");
var atoms = {"null": true};
var isOperatorChar = /[+\-*&%=<>!?|\/]/;
diff --git a/public/vendor/plugins/codemirror/mode/pegjs/index.html b/public/vendor/plugins/codemirror/mode/pegjs/index.html
index 0c74604881..9d452aa9cc 100644
--- a/public/vendor/plugins/codemirror/mode/pegjs/index.html
+++ b/public/vendor/plugins/codemirror/mode/pegjs/index.html
@@ -9,11 +9,11 @@
-
+
- Home
diff --git a/public/vendor/plugins/codemirror/mode/octave/octave.js b/public/vendor/plugins/codemirror/mode/octave/octave.js
index a7bec030c2..33a03368fa 100644
--- a/public/vendor/plugins/codemirror/mode/octave/octave.js
+++ b/public/vendor/plugins/codemirror/mode/octave/octave.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -17,7 +17,7 @@ CodeMirror.defineMode("octave", function() {
}
var singleOperators = new RegExp("^[\\+\\-\\*/&|\\^~<>!@'\\\\]");
- var singleDelimiters = new RegExp('^[\\(\\[\\{\\},:=;]');
+ var singleDelimiters = new RegExp('^[\\(\\[\\{\\},:=;\\.]');
var doubleOperators = new RegExp("^((==)|(~=)|(<=)|(>=)|(<<)|(>>)|(\\.[\\+\\-\\*/\\^\\\\]))");
var doubleDelimiters = new RegExp("^((!=)|(\\+=)|(\\-=)|(\\*=)|(/=)|(&=)|(\\|=)|(\\^=))");
var tripleDelimiters = new RegExp("^((>>=)|(<<=))");
@@ -90,8 +90,8 @@ CodeMirror.defineMode("octave", function() {
if (stream.match(wordRegexp(['nan','NaN','inf','Inf']))) { return 'number'; };
// Handle Strings
- if (stream.match(/^"([^"]|(""))*"/)) { return 'string'; } ;
- if (stream.match(/^'([^']|(''))*'/)) { return 'string'; } ;
+ var m = stream.match(/^"(?:[^"]|"")*("|$)/) || stream.match(/^'(?:[^']|'')*('|$)/)
+ if (m) { return m[1] ? 'string' : "string error"; }
// Handle words
if (stream.match(keywords)) { return 'keyword'; } ;
@@ -126,7 +126,11 @@ CodeMirror.defineMode("octave", function() {
state.tokenize = tokenTranspose;
}
return style;
- }
+ },
+
+ lineComment: '%',
+
+ fold: 'indent'
};
});
diff --git a/public/vendor/plugins/codemirror/mode/oz/index.html b/public/vendor/plugins/codemirror/mode/oz/index.html
index febd82a59a..fb9df83e1a 100644
--- a/public/vendor/plugins/codemirror/mode/oz/index.html
+++ b/public/vendor/plugins/codemirror/mode/oz/index.html
@@ -7,12 +7,12 @@
-
+
- Home
diff --git a/public/vendor/plugins/codemirror/mode/nsis/nsis.js b/public/vendor/plugins/codemirror/mode/nsis/nsis.js
index 172207c5a1..94b8eae24d 100644
--- a/public/vendor/plugins/codemirror/mode/nsis/nsis.js
+++ b/public/vendor/plugins/codemirror/mode/nsis/nsis.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
// Author: Jan T. Sott (http://github.com/idleberg)
@@ -24,20 +24,20 @@ CodeMirror.defineSimpleMode("nsis",{
{ regex: /`(?:[^\\`]|\\.)*`?/, token: "string" },
// Compile Time Commands
- {regex: /(?:\!(include|addincludedir|addplugindir|appendfile|cd|delfile|echo|error|execute|packhdr|finalize|getdllversion|system|tempfile|warning|verbose|define|undef|insertmacro|makensis|searchparse|searchreplace))\b/, token: "keyword"},
+ {regex: /^\s*(?:\!(include|addincludedir|addplugindir|appendfile|cd|delfile|echo|error|execute|packhdr|pragma|finalize|getdllversion|gettlbversion|system|tempfile|warning|verbose|define|undef|insertmacro|macro|macroend|makensis|searchparse|searchreplace))\b/, token: "keyword"},
// Conditional Compilation
- {regex: /(?:\!(if(?:n?def)?|ifmacron?def|macro))\b/, token: "keyword", indent: true},
- {regex: /(?:\!(else|endif|macroend))\b/, token: "keyword", dedent: true},
+ {regex: /^\s*(?:\!(if(?:n?def)?|ifmacron?def|macro))\b/, token: "keyword", indent: true},
+ {regex: /^\s*(?:\!(else|endif|macroend))\b/, token: "keyword", dedent: true},
// Runtime Commands
- {regex: /\b(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetLabelAddress|GetTempFileName|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|IntCmp|IntCmpU|IntFmt|IntOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetPluginUnload|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegStr|WriteUninstaller|XPStyle)\b/, token: "keyword"},
- {regex: /\b(?:Function|PageEx|Section(?:Group)?)\b/, token: "keyword", indent: true},
- {regex: /\b(?:(Function|PageEx|Section(?:Group)?)End)\b/, token: "keyword", dedent: true},
+ {regex: /^\s*(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecShellWait|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetLabelAddress|GetTempFileName|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|Int64Cmp|Int64CmpU|Int64Fmt|IntCmp|IntCmpU|IntFmt|IntOp|IntPtrCmp|IntPtrCmpU|IntPtrOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|PEDllCharacteristics|PESubsysVer|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegMultiStr|WriteRegNone|WriteRegStr|WriteUninstaller|XPStyle)\b/, token: "keyword"},
+ {regex: /^\s*(?:Function|PageEx|Section(?:Group)?)\b/, token: "keyword", indent: true},
+ {regex: /^\s*(?:(Function|PageEx|Section(?:Group)?)End)\b/, token: "keyword", dedent: true},
// Command Options
- {regex: /\b(?:ARCHIVE|FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_NORMAL|FILE_ATTRIBUTE_OFFLINE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_TEMPORARY|HIDDEN|HKCC|HKCR|HKCU|HKDD|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_DYN_DATA|HKEY_LOCAL_MACHINE|HKEY_PERFORMANCE_DATA|HKEY_USERS|HKLM|HKPD|HKU|IDABORT|IDCANCEL|IDD_DIR|IDD_INST|IDD_INSTFILES|IDD_LICENSE|IDD_SELCOM|IDD_UNINST|IDD_VERIFY|IDIGNORE|IDNO|IDOK|IDRETRY|IDYES|MB_ABORTRETRYIGNORE|MB_DEFBUTTON1|MB_DEFBUTTON2|MB_DEFBUTTON3|MB_DEFBUTTON4|MB_ICONEXCLAMATION|MB_ICONINFORMATION|MB_ICONQUESTION|MB_ICONSTOP|MB_OK|MB_OKCANCEL|MB_RETRYCANCEL|MB_RIGHT|MB_RTLREADING|MB_SETFOREGROUND|MB_TOPMOST|MB_USERICON|MB_YESNO|MB_YESNOCANCEL|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SW_HIDE|SW_SHOWDEFAULT|SW_SHOWMAXIMIZED|SW_SHOWMINIMIZED|SW_SHOWNORMAL|SYSTEM|TEMPORARY)\b/, token: "atom"},
- {regex: /\b(?:admin|all|auto|both|bottom|bzip2|components|current|custom|directory|force|hide|highest|ifdiff|ifnewer|instfiles|lastused|leave|left|license|listonly|lzma|nevershow|none|normal|notset|right|show|silent|silentlog|textonly|top|try|un\.components|un\.custom|un\.directory|un\.instfiles|un\.license|uninstConfirm|user|Win10|Win7|Win8|WinVista|zlib)\b/, token: "builtin"},
+ {regex: /\b(?:ARCHIVE|FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_NORMAL|FILE_ATTRIBUTE_OFFLINE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_TEMPORARY|HIDDEN|HKCC|HKCR(32|64)?|HKCU(32|64)?|HKDD|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_DYN_DATA|HKEY_LOCAL_MACHINE|HKEY_PERFORMANCE_DATA|HKEY_USERS|HKLM(32|64)?|HKPD|HKU|IDABORT|IDCANCEL|IDD_DIR|IDD_INST|IDD_INSTFILES|IDD_LICENSE|IDD_SELCOM|IDD_UNINST|IDD_VERIFY|IDIGNORE|IDNO|IDOK|IDRETRY|IDYES|MB_ABORTRETRYIGNORE|MB_DEFBUTTON1|MB_DEFBUTTON2|MB_DEFBUTTON3|MB_DEFBUTTON4|MB_ICONEXCLAMATION|MB_ICONINFORMATION|MB_ICONQUESTION|MB_ICONSTOP|MB_OK|MB_OKCANCEL|MB_RETRYCANCEL|MB_RIGHT|MB_RTLREADING|MB_SETFOREGROUND|MB_TOPMOST|MB_USERICON|MB_YESNO|MB_YESNOCANCEL|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SW_HIDE|SW_SHOWDEFAULT|SW_SHOWMAXIMIZED|SW_SHOWMINIMIZED|SW_SHOWNORMAL|SYSTEM|TEMPORARY)\b/, token: "atom"},
+ {regex: /\b(?:admin|all|auto|both|bottom|bzip2|components|current|custom|directory|false|force|hide|highest|ifdiff|ifnewer|instfiles|lastused|leave|left|license|listonly|lzma|nevershow|none|normal|notset|off|on|right|show|silent|silentlog|textonly|top|true|try|un\.components|un\.custom|un\.directory|un\.instfiles|un\.license|uninstConfirm|user|Win10|Win7|Win8|WinVista|zlib)\b/, token: "builtin"},
// LogicLib.nsh
{regex: /\$\{(?:And(?:If(?:Not)?|Unless)|Break|Case(?:Else)?|Continue|Default|Do(?:Until|While)?|Else(?:If(?:Not)?|Unless)?|End(?:If|Select|Switch)|Exit(?:Do|For|While)|For(?:Each)?|If(?:Cmd|Not(?:Then)?|Then)?|Loop(?:Until|While)?|Or(?:If(?:Not)?|Unless)|Select|Switch|Unless|While)\}/, token: "variable-2", indent: true},
@@ -71,13 +71,13 @@ CodeMirror.defineSimpleMode("nsis",{
{regex: /[-+\/*=<>!]+/, token: "operator"},
// Variable
- {regex: /\$[\w]+/, token: "variable"},
+ {regex: /\$\w+/, token: "variable"},
// Constant
- {regex: /\${[\w]+}/,token: "variable-2"},
+ {regex: /\${[\w\.:-]+}/, token: "variable-2"},
// Language String
- {regex: /\$\([\w]+\)/,token: "variable-3"}
+ {regex: /\$\([\w\.:-]+\)/, token: "variable-3"}
],
comment: [
{regex: /.*?\*\//, token: "comment", next: "start"},
diff --git a/public/vendor/plugins/codemirror/mode/ntriples/index.html b/public/vendor/plugins/codemirror/mode/ntriples/index.html
index 1355e7189e..63a695d527 100644
--- a/public/vendor/plugins/codemirror/mode/ntriples/index.html
+++ b/public/vendor/plugins/codemirror/mode/ntriples/index.html
@@ -1,19 +1,20 @@
-
- Home
@@ -176,6 +176,6 @@ server {
var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
-
- Home
diff --git a/public/vendor/plugins/codemirror/mode/mumps/mumps.js b/public/vendor/plugins/codemirror/mode/mumps/mumps.js
index 469f8c3d1c..3671c9cb36 100644
--- a/public/vendor/plugins/codemirror/mode/mumps/mumps.js
+++ b/public/vendor/plugins/codemirror/mode/mumps/mumps.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
/*
This MUMPS Language script was constructed using vbscript.js as a template.
diff --git a/public/vendor/plugins/codemirror/mode/nginx/index.html b/public/vendor/plugins/codemirror/mode/nginx/index.html
index 03cf671498..7d4ad7e630 100644
--- a/public/vendor/plugins/codemirror/mode/nginx/index.html
+++ b/public/vendor/plugins/codemirror/mode/nginx/index.html
@@ -1,4 +1,4 @@
-
+
- Home
diff --git a/public/vendor/plugins/codemirror/mode/modelica/modelica.js b/public/vendor/plugins/codemirror/mode/modelica/modelica.js
index 77ec7a3c18..a83a4135d0 100644
--- a/public/vendor/plugins/codemirror/mode/modelica/modelica.js
+++ b/public/vendor/plugins/codemirror/mode/modelica/modelica.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
// Modelica support for CodeMirror, copyright (c) by Lennart Ochel
diff --git a/public/vendor/plugins/codemirror/mode/mscgen/index.html b/public/vendor/plugins/codemirror/mode/mscgen/index.html
index 8c28ee6200..a35ffd4320 100644
--- a/public/vendor/plugins/codemirror/mode/mscgen/index.html
+++ b/public/vendor/plugins/codemirror/mode/mscgen/index.html
@@ -9,7 +9,7 @@
- Home
@@ -132,6 +132,25 @@ let () =
(* A Hundred Lines of Caml - http://caml.inria.fr/about/taste.en.html *)
(* OCaml page on Wikipedia - http://en.wikipedia.org/wiki/OCaml *)
+
+module type S = sig type t end
+
+let x = {|
+ this is a long string
+ with many lines and stuff
+ |}
+
+let b = 0b00110
+let h = 0x123abcd
+let e = 1e-10
+let i = 1.
+let x = 30_000
+let o = 0o1234
+
+[1; 2; 3] (* lists *)
+
+1 @ 2
+1. +. 2.
- Home
diff --git a/public/vendor/plugins/codemirror/mode/mirc/mirc.js b/public/vendor/plugins/codemirror/mode/mirc/mirc.js
index f0d5c6ad50..d27b0152e9 100644
--- a/public/vendor/plugins/codemirror/mode/mirc/mirc.js
+++ b/public/vendor/plugins/codemirror/mode/mirc/mirc.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
//mIRC mode by Ford_Lawnmower :: Based on Velocity mode by Steve O'Hara
@@ -130,7 +130,7 @@ CodeMirror.defineMode("mirc", function() {
}
}
else if (ch == "%") {
- stream.eatWhile(/[^,^\s^\(^\)]/);
+ stream.eatWhile(/[^,\s()]/);
state.beforeParams = true;
return "string";
}
diff --git a/public/vendor/plugins/codemirror/mode/mllike/index.html b/public/vendor/plugins/codemirror/mode/mllike/index.html
index 5923af8f87..491373171f 100644
--- a/public/vendor/plugins/codemirror/mode/mllike/index.html
+++ b/public/vendor/plugins/codemirror/mode/mllike/index.html
@@ -12,7 +12,7 @@
.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
- Home
diff --git a/public/vendor/plugins/codemirror/mode/mbox/mbox.js b/public/vendor/plugins/codemirror/mode/mbox/mbox.js
index ba2416ac81..640437ed64 100644
--- a/public/vendor/plugins/codemirror/mode/mbox/mbox.js
+++ b/public/vendor/plugins/codemirror/mode/mbox/mbox.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/public/vendor/plugins/codemirror/mode/meta.js b/public/vendor/plugins/codemirror/mode/meta.js
index eb25e242dd..e9155037a1 100644
--- a/public/vendor/plugins/codemirror/mode/meta.js
+++ b/public/vendor/plugins/codemirror/mode/meta.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -13,19 +13,19 @@
CodeMirror.modeInfo = [
{name: "APL", mime: "text/apl", mode: "apl", ext: ["dyalog", "apl"]},
- {name: "PGP", mimes: ["application/pgp", "application/pgp-keys", "application/pgp-signature"], mode: "asciiarmor", ext: ["pgp"]},
+ {name: "PGP", mimes: ["application/pgp", "application/pgp-encrypted", "application/pgp-keys", "application/pgp-signature"], mode: "asciiarmor", ext: ["asc", "pgp", "sig"]},
{name: "ASN.1", mime: "text/x-ttcn-asn", mode: "asn.1", ext: ["asn", "asn1"]},
{name: "Asterisk", mime: "text/x-asterisk", mode: "asterisk", file: /^extensions\.conf$/i},
{name: "Brainfuck", mime: "text/x-brainfuck", mode: "brainfuck", ext: ["b", "bf"]},
- {name: "C", mime: "text/x-csrc", mode: "clike", ext: ["c", "h"]},
+ {name: "C", mime: "text/x-csrc", mode: "clike", ext: ["c", "h", "ino"]},
{name: "C++", mime: "text/x-c++src", mode: "clike", ext: ["cpp", "c++", "cc", "cxx", "hpp", "h++", "hh", "hxx"], alias: ["cpp"]},
{name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ["cob", "cpy"]},
- {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"], alias: ["csharp"]},
+ {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"], alias: ["csharp", "cs"]},
{name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ["clj", "cljc", "cljx"]},
{name: "ClojureScript", mime: "text/x-clojurescript", mode: "clojure", ext: ["cljs"]},
{name: "Closure Stylesheets (GSS)", mime: "text/x-gss", mode: "css", ext: ["gss"]},
{name: "CMake", mime: "text/x-cmake", mode: "cmake", ext: ["cmake", "cmake.in"], file: /^CMakeLists.txt$/},
- {name: "CoffeeScript", mime: "text/x-coffeescript", mode: "coffeescript", ext: ["coffee"], alias: ["coffee", "coffee-script"]},
+ {name: "CoffeeScript", mimes: ["application/vnd.coffeescript", "text/coffeescript", "text/x-coffeescript"], mode: "coffeescript", ext: ["coffee"], alias: ["coffee", "coffee-script"]},
{name: "Common Lisp", mime: "text/x-common-lisp", mode: "commonlisp", ext: ["cl", "lisp", "el"], alias: ["lisp"]},
{name: "Cypher", mime: "application/x-cypher-query", mode: "cypher", ext: ["cyp", "cypher"]},
{name: "Cython", mime: "text/x-cython", mode: "python", ext: ["pyx", "pxd", "pxi"]},
@@ -47,26 +47,27 @@
{name: "Embedded Javascript", mime: "application/x-ejs", mode: "htmlembedded", ext: ["ejs"]},
{name: "Embedded Ruby", mime: "application/x-erb", mode: "htmlembedded", ext: ["erb"]},
{name: "Erlang", mime: "text/x-erlang", mode: "erlang", ext: ["erl"]},
+ {name: "Esper", mime: "text/x-esper", mode: "sql"},
{name: "Factor", mime: "text/x-factor", mode: "factor", ext: ["factor"]},
{name: "FCL", mime: "text/x-fcl", mode: "fcl"},
{name: "Forth", mime: "text/x-forth", mode: "forth", ext: ["forth", "fth", "4th"]},
- {name: "Fortran", mime: "text/x-fortran", mode: "fortran", ext: ["f", "for", "f77", "f90"]},
+ {name: "Fortran", mime: "text/x-fortran", mode: "fortran", ext: ["f", "for", "f77", "f90", "f95"]},
{name: "F#", mime: "text/x-fsharp", mode: "mllike", ext: ["fs"], alias: ["fsharp"]},
{name: "Gas", mime: "text/x-gas", mode: "gas", ext: ["s"]},
{name: "Gherkin", mime: "text/x-feature", mode: "gherkin", ext: ["feature"]},
{name: "GitHub Flavored Markdown", mime: "text/x-gfm", mode: "gfm", file: /^(readme|contributing|history).md$/i},
{name: "Go", mime: "text/x-go", mode: "go", ext: ["go"]},
- {name: "Groovy", mime: "text/x-groovy", mode: "groovy", ext: ["groovy", "gradle"]},
+ {name: "Groovy", mime: "text/x-groovy", mode: "groovy", ext: ["groovy", "gradle"], file: /^Jenkinsfile$/},
{name: "HAML", mime: "text/x-haml", mode: "haml", ext: ["haml"]},
{name: "Haskell", mime: "text/x-haskell", mode: "haskell", ext: ["hs"]},
{name: "Haskell (Literate)", mime: "text/x-literate-haskell", mode: "haskell-literate", ext: ["lhs"]},
{name: "Haxe", mime: "text/x-haxe", mode: "haxe", ext: ["hx"]},
{name: "HXML", mime: "text/x-hxml", mode: "haxe", ext: ["hxml"]},
{name: "ASP.NET", mime: "application/x-aspx", mode: "htmlembedded", ext: ["aspx"], alias: ["asp", "aspx"]},
- {name: "HTML", mime: "text/html", mode: "htmlmixed", ext: ["html", "htm"], alias: ["xhtml"]},
+ {name: "HTML", mime: "text/html", mode: "htmlmixed", ext: ["html", "htm", "handlebars", "hbs"], alias: ["xhtml"]},
{name: "HTTP", mime: "message/http", mode: "http"},
{name: "IDL", mime: "text/x-idl", mode: "idl", ext: ["pro"]},
- {name: "Jade", mime: "text/x-jade", mode: "jade", ext: ["jade"]},
+ {name: "Pug", mime: "text/x-pug", mode: "pug", ext: ["jade", "pug"], alias: ["jade"]},
{name: "Java", mime: "text/x-java", mode: "clike", ext: ["java"]},
{name: "Java Server Pages", mime: "application/x-jsp", mode: "htmlembedded", ext: ["jsp"], alias: ["jsp"]},
{name: "JavaScript", mimes: ["text/javascript", "text/ecmascript", "application/javascript", "application/x-javascript", "application/ecmascript"],
@@ -74,7 +75,7 @@
{name: "JSON", mimes: ["application/json", "application/x-json"], mode: "javascript", ext: ["json", "map"], alias: ["json5"]},
{name: "JSON-LD", mime: "application/ld+json", mode: "javascript", ext: ["jsonld"], alias: ["jsonld"]},
{name: "JSX", mime: "text/jsx", mode: "jsx", ext: ["jsx"]},
- {name: "Jinja2", mime: "null", mode: "jinja2"},
+ {name: "Jinja2", mime: "text/jinja2", mode: "jinja2", ext: ["j2", "jinja", "jinja2"]},
{name: "Julia", mime: "text/x-julia", mode: "julia", ext: ["jl"]},
{name: "Kotlin", mime: "text/x-kotlin", mode: "clike", ext: ["kt"]},
{name: "LESS", mime: "text/x-less", mode: "css", ext: ["less"]},
@@ -83,7 +84,7 @@
{name: "Markdown", mime: "text/x-markdown", mode: "markdown", ext: ["markdown", "md", "mkd"]},
{name: "mIRC", mime: "text/mirc", mode: "mirc"},
{name: "MariaDB SQL", mime: "text/x-mariadb", mode: "sql"},
- {name: "Mathematica", mime: "text/x-mathematica", mode: "mathematica", ext: ["m", "nb"]},
+ {name: "Mathematica", mime: "text/x-mathematica", mode: "mathematica", ext: ["m", "nb", "wl", "wls"]},
{name: "Modelica", mime: "text/x-modelica", mode: "modelica", ext: ["mo"]},
{name: "MUMPS", mime: "text/x-mumps", mode: "mumps", ext: ["mps"]},
{name: "MS SQL", mime: "text/x-mssql", mode: "sql"},
@@ -91,25 +92,27 @@
{name: "MySQL", mime: "text/x-mysql", mode: "sql"},
{name: "Nginx", mime: "text/x-nginx-conf", mode: "nginx", file: /nginx.*\.conf$/i},
{name: "NSIS", mime: "text/x-nsis", mode: "nsis", ext: ["nsh", "nsi"]},
- {name: "NTriples", mime: "text/n-triples", mode: "ntriples", ext: ["nt"]},
- {name: "Objective C", mime: "text/x-objectivec", mode: "clike", ext: ["m", "mm"], alias: ["objective-c", "objc"]},
+ {name: "NTriples", mimes: ["application/n-triples", "application/n-quads", "text/n-triples"],
+ mode: "ntriples", ext: ["nt", "nq"]},
+ {name: "Objective-C", mime: "text/x-objectivec", mode: "clike", ext: ["m", "mm"], alias: ["objective-c", "objc"]},
{name: "OCaml", mime: "text/x-ocaml", mode: "mllike", ext: ["ml", "mli", "mll", "mly"]},
{name: "Octave", mime: "text/x-octave", mode: "octave", ext: ["m"]},
{name: "Oz", mime: "text/x-oz", mode: "oz", ext: ["oz"]},
{name: "Pascal", mime: "text/x-pascal", mode: "pascal", ext: ["p", "pas"]},
{name: "PEG.js", mime: "null", mode: "pegjs", ext: ["jsonld"]},
{name: "Perl", mime: "text/x-perl", mode: "perl", ext: ["pl", "pm"]},
- {name: "PHP", mime: "application/x-httpd-php", mode: "php", ext: ["php", "php3", "php4", "php5", "phtml"]},
+ {name: "PHP", mimes: ["text/x-php", "application/x-httpd-php", "application/x-httpd-php-open"], mode: "php", ext: ["php", "php3", "php4", "php5", "php7", "phtml"]},
{name: "Pig", mime: "text/x-pig", mode: "pig", ext: ["pig"]},
{name: "Plain Text", mime: "text/plain", mode: "null", ext: ["txt", "text", "conf", "def", "list", "log"]},
{name: "PLSQL", mime: "text/x-plsql", mode: "sql", ext: ["pls"]},
+ {name: "PostgreSQL", mime: "text/x-pgsql", mode: "sql"},
{name: "PowerShell", mime: "application/x-powershell", mode: "powershell", ext: ["ps1", "psd1", "psm1"]},
{name: "Properties files", mime: "text/x-properties", mode: "properties", ext: ["properties", "ini", "in"], alias: ["ini", "properties"]},
{name: "ProtoBuf", mime: "text/x-protobuf", mode: "protobuf", ext: ["proto"]},
{name: "Python", mime: "text/x-python", mode: "python", ext: ["BUILD", "bzl", "py", "pyw"], file: /^(BUCK|BUILD)$/},
{name: "Puppet", mime: "text/x-puppet", mode: "puppet", ext: ["pp"]},
{name: "Q", mime: "text/x-q", mode: "q", ext: ["q"]},
- {name: "R", mime: "text/x-rsrc", mode: "r", ext: ["r"], alias: ["rscript"]},
+ {name: "R", mime: "text/x-rsrc", mode: "r", ext: ["r", "R"], alias: ["rscript"]},
{name: "reStructuredText", mime: "text/x-rst", mode: "rst", ext: ["rst"], alias: ["rst"]},
{name: "RPM Changes", mime: "text/x-rpm-changes", mode: "rpm"},
{name: "RPM Spec", mime: "text/x-rpm-spec", mode: "rpm", ext: ["spec"]},
@@ -120,21 +123,24 @@
{name: "Scala", mime: "text/x-scala", mode: "clike", ext: ["scala"]},
{name: "Scheme", mime: "text/x-scheme", mode: "scheme", ext: ["scm", "ss"]},
{name: "SCSS", mime: "text/x-scss", mode: "css", ext: ["scss"]},
- {name: "Shell", mime: "text/x-sh", mode: "shell", ext: ["sh", "ksh", "bash"], alias: ["bash", "sh", "zsh"], file: /^PKGBUILD$/},
+ {name: "Shell", mimes: ["text/x-sh", "application/x-sh"], mode: "shell", ext: ["sh", "ksh", "bash"], alias: ["bash", "sh", "zsh"], file: /^PKGBUILD$/},
{name: "Sieve", mime: "application/sieve", mode: "sieve", ext: ["siv", "sieve"]},
{name: "Slim", mimes: ["text/x-slim", "application/x-slim"], mode: "slim", ext: ["slim"]},
{name: "Smalltalk", mime: "text/x-stsrc", mode: "smalltalk", ext: ["st"]},
{name: "Smarty", mime: "text/x-smarty", mode: "smarty", ext: ["tpl"]},
{name: "Solr", mime: "text/x-solr", mode: "solr"},
+ {name: "SML", mime: "text/x-sml", mode: "mllike", ext: ["sml", "sig", "fun", "smackspec"]},
{name: "Soy", mime: "text/x-soy", mode: "soy", ext: ["soy"], alias: ["closure template"]},
{name: "SPARQL", mime: "application/sparql-query", mode: "sparql", ext: ["rq", "sparql"], alias: ["sparul"]},
{name: "Spreadsheet", mime: "text/x-spreadsheet", mode: "spreadsheet", alias: ["excel", "formula"]},
{name: "SQL", mime: "text/x-sql", mode: "sql", ext: ["sql"]},
+ {name: "SQLite", mime: "text/x-sqlite", mode: "sql"},
{name: "Squirrel", mime: "text/x-squirrel", mode: "clike", ext: ["nut"]},
+ {name: "Stylus", mime: "text/x-styl", mode: "stylus", ext: ["styl"]},
{name: "Swift", mime: "text/x-swift", mode: "swift", ext: ["swift"]},
{name: "sTeX", mime: "text/x-stex", mode: "stex"},
- {name: "LaTeX", mime: "text/x-latex", mode: "stex", ext: ["text", "ltx"], alias: ["tex"]},
- {name: "SystemVerilog", mime: "text/x-systemverilog", mode: "verilog", ext: ["v"]},
+ {name: "LaTeX", mime: "text/x-latex", mode: "stex", ext: ["text", "ltx", "tex"], alias: ["tex"]},
+ {name: "SystemVerilog", mime: "text/x-systemverilog", mode: "verilog", ext: ["v", "sv", "svh"]},
{name: "Tcl", mime: "text/x-tcl", mode: "tcl", ext: ["tcl"]},
{name: "Textile", mime: "text/x-textile", mode: "textile", ext: ["textile"]},
{name: "TiddlyWiki ", mime: "text/x-tiddlywiki", mode: "tiddlywiki"},
@@ -146,6 +152,7 @@
{name: "TTCN_CFG", mime: "text/x-ttcn-cfg", mode: "ttcn-cfg", ext: ["cfg"]},
{name: "Turtle", mime: "text/turtle", mode: "turtle", ext: ["ttl"]},
{name: "TypeScript", mime: "application/typescript", mode: "javascript", ext: ["ts"], alias: ["ts"]},
+ {name: "TypeScript-JSX", mime: "text/typescript-jsx", mode: "jsx", ext: ["tsx"], alias: ["tsx"]},
{name: "Twig", mime: "text/x-twig", mode: "twig"},
{name: "Web IDL", mime: "text/x-webidl", mode: "webidl", ext: ["webidl"]},
{name: "VB.NET", mime: "text/x-vb", mode: "vb", ext: ["vb"]},
@@ -153,10 +160,11 @@
{name: "Velocity", mime: "text/velocity", mode: "velocity", ext: ["vtl"]},
{name: "Verilog", mime: "text/x-verilog", mode: "verilog", ext: ["v"]},
{name: "VHDL", mime: "text/x-vhdl", mode: "vhdl", ext: ["vhd", "vhdl"]},
- {name: "XML", mimes: ["application/xml", "text/xml"], mode: "xml", ext: ["xml", "xsl", "xsd"], alias: ["rss", "wsdl", "xsd"]},
+ {name: "Vue.js Component", mimes: ["script/x-vue", "text/x-vue"], mode: "vue", ext: ["vue"]},
+ {name: "XML", mimes: ["application/xml", "text/xml"], mode: "xml", ext: ["xml", "xsl", "xsd", "svg"], alias: ["rss", "wsdl", "xsd"]},
{name: "XQuery", mime: "application/xquery", mode: "xquery", ext: ["xy", "xquery"]},
{name: "Yacas", mime: "text/x-yacas", mode: "yacas", ext: ["ys"]},
- {name: "YAML", mime: "text/x-yaml", mode: "yaml", ext: ["yaml", "yml"], alias: ["yml"]},
+ {name: "YAML", mimes: ["text/x-yaml", "text/yaml"], mode: "yaml", ext: ["yaml", "yml"], alias: ["yml"]},
{name: "Z80", mime: "text/x-z80", mode: "z80", ext: ["z80"]},
{name: "mscgen", mime: "text/x-mscgen", mode: "mscgen", ext: ["mscgen", "mscin", "msc"]},
{name: "xu", mime: "text/x-xu", mode: "mscgen", ext: ["xu"]},
@@ -176,6 +184,8 @@
if (info.mimes) for (var j = 0; j < info.mimes.length; j++)
if (info.mimes[j] == mime) return info;
}
+ if (/\+xml$/.test(mime)) return CodeMirror.findModeByMIME("application/xml")
+ if (/\+json$/.test(mime)) return CodeMirror.findModeByMIME("application/json")
};
CodeMirror.findModeByExtension = function(ext) {
diff --git a/public/vendor/plugins/codemirror/mode/mirc/index.html b/public/vendor/plugins/codemirror/mode/mirc/index.html
index fd2f34e4ba..98f81750fa 100644
--- a/public/vendor/plugins/codemirror/mode/mirc/index.html
+++ b/public/vendor/plugins/codemirror/mode/mirc/index.html
@@ -7,10 +7,11 @@
+
-
+
- Home
@@ -28,13 +29,13 @@
- Home
diff --git a/public/vendor/plugins/codemirror/mode/javascript/test.js b/public/vendor/plugins/codemirror/mode/javascript/test.js
index 8916b7558f..327eac76b9 100644
--- a/public/vendor/plugins/codemirror/mode/javascript/test.js
+++ b/public/vendor/plugins/codemirror/mode/javascript/test.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function() {
var mode = CodeMirror.getMode({indentUnit: 2}, "javascript");
@@ -31,13 +31,29 @@
MT("class",
"[keyword class] [def Point] [keyword extends] [variable SuperThing] {",
- " [property get] [property prop]() { [keyword return] [number 24]; }",
+ " [keyword get] [property prop]() { [keyword return] [number 24]; }",
" [property constructor]([def x], [def y]) {",
" [keyword super]([string 'something']);",
" [keyword this].[property x] [operator =] [variable-2 x];",
" }",
"}");
+ MT("anonymous_class_expression",
+ "[keyword const] [def Adder] [operator =] [keyword class] [keyword extends] [variable Arithmetic] {",
+ " [property add]([def a], [def b]) {}",
+ "};");
+
+ MT("named_class_expression",
+ "[keyword const] [def Subber] [operator =] [keyword class] [def Subtract] {",
+ " [property sub]([def a], [def b]) {}",
+ "};");
+
+ MT("class_async_method",
+ "[keyword class] [def Foo] {",
+ " [property sayName1]() {}",
+ " [keyword async] [property sayName2]() {}",
+ "}");
+
MT("import",
"[keyword function] [def foo]() {",
" [keyword import] [def $] [keyword from] [string 'jquery'];",
@@ -47,6 +63,12 @@
MT("import_trailing_comma",
"[keyword import] {[def foo], [def bar],} [keyword from] [string 'baz']")
+ MT("import_dynamic",
+ "[keyword import]([string 'baz']).[property then]")
+
+ MT("import_dynamic",
+ "[keyword const] [def t] [operator =] [keyword import]([string 'baz']).[property then]")
+
MT("const",
"[keyword function] [def f]() {",
" [keyword const] [[ [def a], [def b] ]] [operator =] [[ [number 1], [number 2] ]];",
@@ -55,12 +77,44 @@
MT("for/of",
"[keyword for]([keyword let] [def of] [keyword of] [variable something]) {}");
+ MT("for await",
+ "[keyword for] [keyword await]([keyword let] [def of] [keyword of] [variable something]) {}");
+
MT("generator",
"[keyword function*] [def repeat]([def n]) {",
" [keyword for]([keyword var] [def i] [operator =] [number 0]; [variable-2 i] [operator <] [variable-2 n]; [operator ++][variable-2 i])",
" [keyword yield] [variable-2 i];",
"}");
+ MT("let_scoping",
+ "[keyword function] [def scoped]([def n]) {",
+ " { [keyword var] [def i]; } [variable-2 i];",
+ " { [keyword let] [def j]; [variable-2 j]; } [variable j];",
+ " [keyword if] ([atom true]) { [keyword const] [def k]; [variable-2 k]; } [variable k];",
+ "}");
+
+ MT("switch_scoping",
+ "[keyword switch] ([variable x]) {",
+ " [keyword default]:",
+ " [keyword let] [def j];",
+ " [keyword return] [variable-2 j]",
+ "}",
+ "[variable j];")
+
+ MT("leaving_scope",
+ "[keyword function] [def a]() {",
+ " {",
+ " [keyword const] [def x] [operator =] [number 1]",
+ " [keyword if] ([atom true]) {",
+ " [keyword let] [def y] [operator =] [number 2]",
+ " [keyword var] [def z] [operator =] [number 3]",
+ " [variable console].[property log]([variable-2 x], [variable-2 y], [variable-2 z])",
+ " }",
+ " [variable console].[property log]([variable-2 x], [variable y], [variable-2 z])",
+ " }",
+ " [variable console].[property log]([variable x], [variable y], [variable-2 z])",
+ "}")
+
MT("quotedStringAddition",
"[keyword let] [def f] [operator =] [variable a] [operator +] [string 'fatarrow'] [operator +] [variable c];");
@@ -73,6 +127,9 @@
"[keyword let] [def f] [operator =] ([[ [def a], [def b] ]], [def c]) [operator =>] [variable-2 a] [operator +] [variable-2 c];",
"[variable c];");
+ MT("fatArrow_stringDefault",
+ "([def a], [def b] [operator =] [string 'x\\'y']) [operator =>] [variable-2 a] [operator +] [variable-2 b]")
+
MT("spread",
"[keyword function] [def f]([def a], [meta ...][def b]) {",
" [variable something]([variable-2 a], [meta ...][variable-2 b]);",
@@ -140,6 +197,19 @@
" [number 1];",
"[number 2];");
+ MT("indent_semicolonless_if",
+ "[keyword function] [def foo]() {",
+ " [keyword if] ([variable x])",
+ " [variable foo]()",
+ "}")
+
+ MT("indent_semicolonless_if_with_statement",
+ "[keyword function] [def foo]() {",
+ " [keyword if] ([variable x])",
+ " [variable foo]()",
+ " [variable bar]()",
+ "}")
+
MT("multilinestring",
"[keyword var] [def x] [operator =] [string 'foo\\]",
"[string bar'];");
@@ -159,6 +229,12 @@
" [keyword return] [variable-2 x];",
"}");
+ MT(
+ "param_destructuring",
+ "[keyword function] [def foo]([def x] [operator =] [string-2 `foo${][number 10][string-2 }bar`]) {",
+ " [keyword return] [variable-2 x];",
+ "}");
+
MT("new_target",
"[keyword function] [def F]([def target]) {",
" [keyword if] ([variable-2 target] [operator &&] [keyword new].[keyword target].[property name]) {",
@@ -167,6 +243,236 @@
" }",
"}");
+ MT("async",
+ "[keyword async] [keyword function] [def foo]([def args]) { [keyword return] [atom true]; }");
+
+ MT("async_assignment",
+ "[keyword const] [def foo] [operator =] [keyword async] [keyword function] ([def args]) { [keyword return] [atom true]; };");
+
+ MT("async_object",
+ "[keyword let] [def obj] [operator =] { [property async]: [atom false] };");
+
+ // async be highlighet as keyword and foo as def, but it requires potentially expensive look-ahead. See #4173
+ MT("async_object_function",
+ "[keyword let] [def obj] [operator =] { [property async] [property foo]([def args]) { [keyword return] [atom true]; } };");
+
+ MT("async_object_properties",
+ "[keyword let] [def obj] [operator =] {",
+ " [property prop1]: [keyword async] [keyword function] ([def args]) { [keyword return] [atom true]; },",
+ " [property prop2]: [keyword async] [keyword function] ([def args]) { [keyword return] [atom true]; },",
+ " [property prop3]: [keyword async] [keyword function] [def prop3]([def args]) { [keyword return] [atom true]; },",
+ "};");
+
+ MT("async_arrow",
+ "[keyword const] [def foo] [operator =] [keyword async] ([def args]) [operator =>] { [keyword return] [atom true]; };");
+
+ MT("async_jquery",
+ "[variable $].[property ajax]({",
+ " [property url]: [variable url],",
+ " [property async]: [atom true],",
+ " [property method]: [string 'GET']",
+ "});");
+
+ MT("async_variable",
+ "[keyword const] [def async] [operator =] {[property a]: [number 1]};",
+ "[keyword const] [def foo] [operator =] [string-2 `bar ${][variable async].[property a][string-2 }`];")
+
+ MT("bigint", "[number 1n] [operator +] [number 0x1afn] [operator +] [number 0o064n] [operator +] [number 0b100n];")
+
+ MT("async_comment",
+ "[keyword async] [comment /**/] [keyword function] [def foo]([def args]) { [keyword return] [atom true]; }");
+
+ MT("indent_switch",
+ "[keyword switch] ([variable x]) {",
+ " [keyword default]:",
+ " [keyword return] [number 2]",
+ "}")
+
+ MT("regexp_corner_case",
+ "[operator +]{} [operator /] [atom undefined];",
+ "[[[meta ...][string-2 /\\//] ]];",
+ "[keyword void] [string-2 /\\//];",
+ "[keyword do] [string-2 /\\//]; [keyword while] ([number 0]);",
+ "[keyword if] ([number 0]) {} [keyword else] [string-2 /\\//];",
+ "[string-2 `${][variable async][operator ++][string-2 }//`];",
+ "[string-2 `${]{} [operator /] [string-2 /\\//}`];")
+
+ MT("return_eol",
+ "[keyword return]",
+ "{} [string-2 /5/]")
+
+ MT("numeric separator",
+ "[number 123_456];",
+ "[number 0xdead_c0de];",
+ "[number 0o123_456];",
+ "[number 0b1101_1101];",
+ "[number .123_456e0_1];",
+ "[number 1E+123_456];",
+ "[number 12_34_56n];")
+
+ MT("underscore property",
+ "[variable something].[property _property];",
+ "[variable something].[property _123];",
+ "[variable something].[property _for];",
+ "[variable _for];",
+ "[variable _123];")
+
+ var ts_mode = CodeMirror.getMode({indentUnit: 2}, "application/typescript")
+ function TS(name) {
+ test.mode(name, ts_mode, Array.prototype.slice.call(arguments, 1))
+ }
+
+ TS("typescript_extend_type",
+ "[keyword class] [def Foo] [keyword extends] [type Some][operator <][type Type][operator >] {}")
+
+ TS("typescript_arrow_type",
+ "[keyword let] [def x]: ([variable arg]: [type Type]) [operator =>] [type ReturnType]")
+
+ TS("typescript_class",
+ "[keyword class] [def Foo] {",
+ " [keyword public] [keyword static] [property main]() {}",
+ " [keyword private] [property _foo]: [type string];",
+ "}")
+
+ TS("typescript_literal_types",
+ "[keyword import] [keyword *] [keyword as] [def Sequelize] [keyword from] [string 'sequelize'];",
+ "[keyword interface] [def MyAttributes] {",
+ " [property truthy]: [string 'true'] [operator |] [number 1] [operator |] [atom true];",
+ " [property falsy]: [string 'false'] [operator |] [number 0] [operator |] [atom false];",
+ "}",
+ "[keyword interface] [def MyInstance] [keyword extends] [type Sequelize].[type Instance] [operator <] [type MyAttributes] [operator >] {",
+ " [property rawAttributes]: [type MyAttributes];",
+ " [property truthy]: [string 'true'] [operator |] [number 1] [operator |] [atom true];",
+ " [property falsy]: [string 'false'] [operator |] [number 0] [operator |] [atom false];",
+ "}")
+
+ TS("typescript_extend_operators",
+ "[keyword export] [keyword interface] [def UserModel] [keyword extends]",
+ " [type Sequelize].[type Model] [operator <] [type UserInstance], [type UserAttributes] [operator >] {",
+ " [property findById]: (",
+ " [variable userId]: [type number]",
+ " ) [operator =>] [type Promise] [operator <] [type Array] [operator <] { [property id], [property name] } [operator >>];",
+ " [property updateById]: (",
+ " [variable userId]: [type number],",
+ " [variable isActive]: [type boolean]",
+ " ) [operator =>] [type Promise] [operator <] [type AccountHolderNotificationPreferenceInstance] [operator >];",
+ " }")
+
+ TS("typescript_interface_with_const",
+ "[keyword const] [def hello]: {",
+ " [property prop1][operator ?]: [type string];",
+ " [property prop2][operator ?]: [type string];",
+ "} [operator =] {};")
+
+ TS("typescript_double_extend",
+ "[keyword export] [keyword interface] [def UserAttributes] {",
+ " [property id][operator ?]: [type number];",
+ " [property createdAt][operator ?]: [type Date];",
+ "}",
+ "[keyword export] [keyword interface] [def UserInstance] [keyword extends] [type Sequelize].[type Instance][operator <][type UserAttributes][operator >], [type UserAttributes] {",
+ " [property id]: [type number];",
+ " [property createdAt]: [type Date];",
+ "}");
+
+ TS("typescript_index_signature",
+ "[keyword interface] [def A] {",
+ " [[ [variable prop]: [type string] ]]: [type any];",
+ " [property prop1]: [type any];",
+ "}");
+
+ TS("typescript_generic_class",
+ "[keyword class] [def Foo][operator <][type T][operator >] {",
+ " [property bar]() {}",
+ " [property foo](): [type Foo] {}",
+ "}")
+
+ TS("typescript_type_when_keyword",
+ "[keyword export] [keyword type] [type AB] [operator =] [type A] [operator |] [type B];",
+ "[keyword type] [type Flags] [operator =] {",
+ " [property p1]: [type string];",
+ " [property p2]: [type boolean];",
+ "};")
+
+ TS("typescript_type_when_not_keyword",
+ "[keyword class] [def HasType] {",
+ " [property type]: [type string];",
+ " [property constructor]([def type]: [type string]) {",
+ " [keyword this].[property type] [operator =] [variable-2 type];",
+ " }",
+ " [property setType]({ [def type] }: { [property type]: [type string]; }) {",
+ " [keyword this].[property type] [operator =] [variable-2 type];",
+ " }",
+ "}")
+
+ TS("typescript_function_generics",
+ "[keyword function] [def a]() {}",
+ "[keyword function] [def b][operator <][type IA] [keyword extends] [type object], [type IB] [keyword extends] [type object][operator >]() {}",
+ "[keyword function] [def c]() {}")
+
+ TS("typescript_complex_return_type",
+ "[keyword function] [def A]() {",
+ " [keyword return] [keyword this].[property property];",
+ "}",
+ "[keyword function] [def B](): [type Promise][operator <]{ [[ [variable key]: [type string] ]]: [type any] } [operator |] [atom null][operator >] {",
+ " [keyword return] [keyword this].[property property];",
+ "}")
+
+ TS("typescript_complex_type_casting",
+ "[keyword const] [def giftpay] [operator =] [variable config].[property get]([string 'giftpay']) [keyword as] { [[ [variable platformUuid]: [type string] ]]: { [property version]: [type number]; [property apiCode]: [type string]; } };")
+
+ TS("typescript_keyof",
+ "[keyword function] [def x][operator <][type T] [keyword extends] [keyword keyof] [type X][operator >]([def a]: [type T]) {",
+ " [keyword return]")
+
+ TS("typescript_new_typeargs",
+ "[keyword let] [def x] [operator =] [keyword new] [variable Map][operator <][type string], [type Date][operator >]([string-2 `foo${][variable bar][string-2 }`])")
+
+ TS("modifiers",
+ "[keyword class] [def Foo] {",
+ " [keyword public] [keyword abstract] [property bar]() {}",
+ " [property constructor]([keyword readonly] [keyword private] [def x]) {}",
+ "}")
+
+ TS("arrow prop",
+ "({[property a]: [def p] [operator =>] [variable-2 p]})")
+
+ TS("generic in function call",
+ "[keyword this].[property a][operator <][type Type][operator >]([variable foo]);",
+ "[keyword this].[property a][operator <][variable Type][operator >][variable foo];")
+
+ TS("type guard",
+ "[keyword class] [def Appler] {",
+ " [keyword static] [property assertApple]([def fruit]: [type Fruit]): [variable-2 fruit] [keyword is] [type Apple] {",
+ " [keyword if] ([operator !]([variable-2 fruit] [keyword instanceof] [variable Apple]))",
+ " [keyword throw] [keyword new] [variable Error]();",
+ " }",
+ "}")
+
+ TS("type as variable",
+ "[variable type] [operator =] [variable x] [keyword as] [type Bar];");
+
+ TS("enum body",
+ "[keyword export] [keyword const] [keyword enum] [def CodeInspectionResultType] {",
+ " [def ERROR] [operator =] [string 'problem_type_error'],",
+ " [def WARNING] [operator =] [string 'problem_type_warning'],",
+ " [def META],",
+ "}")
+
+ TS("parenthesized type",
+ "[keyword class] [def Foo] {",
+ " [property x] [operator =] [keyword new] [variable A][operator <][type B], [type string][operator |](() [operator =>] [type void])[operator >]();",
+ " [keyword private] [property bar]();",
+ "}")
+
+ TS("abstract class",
+ "[keyword export] [keyword abstract] [keyword class] [def Foo] {}")
+
+ TS("interface without semicolons",
+ "[keyword interface] [def Foo] {",
+ " [property greet]([def x]: [type int]): [type blah]",
+ " [property bar]: [type void]",
+ "}")
+
var jsonld_mode = CodeMirror.getMode(
{indentUnit: 2},
{name: "javascript", jsonld: true}
diff --git a/public/vendor/plugins/codemirror/mode/javascript/typescript.html b/public/vendor/plugins/codemirror/mode/javascript/typescript.html
index 2cfc5381fe..3b217a44f9 100644
--- a/public/vendor/plugins/codemirror/mode/javascript/typescript.html
+++ b/public/vendor/plugins/codemirror/mode/javascript/typescript.html
@@ -6,10 +6,11 @@
+
-
+
-CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/index.html b/public/vendor/plugins/codemirror/mode/index.html
index 732e0e52cd..858ba127f2 100644
--- a/public/vendor/plugins/codemirror/mode/index.html
+++ b/public/vendor/plugins/codemirror/mode/index.html
@@ -5,7 +5,7 @@
- Home
diff --git a/public/vendor/plugins/codemirror/mode/idl/idl.js b/public/vendor/plugins/codemirror/mode/idl/idl.js
index 07308d71dc..168761cd88 100644
--- a/public/vendor/plugins/codemirror/mode/idl/idl.js
+++ b/public/vendor/plugins/codemirror/mode/idl/idl.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/public/vendor/plugins/codemirror/mode/idl/index.html b/public/vendor/plugins/codemirror/mode/idl/index.html
index 4c169e2d69..6ef17d093e 100644
--- a/public/vendor/plugins/codemirror/mode/idl/index.html
+++ b/public/vendor/plugins/codemirror/mode/idl/index.html
@@ -6,10 +6,11 @@
+
-
+
- Home
@@ -34,7 +34,7 @@
- Home
diff --git a/public/vendor/plugins/codemirror/mode/htmlmixed/htmlmixed.js b/public/vendor/plugins/codemirror/mode/htmlmixed/htmlmixed.js
index d74083ee1a..8341ac8261 100644
--- a/public/vendor/plugins/codemirror/mode/htmlmixed/htmlmixed.js
+++ b/public/vendor/plugins/codemirror/mode/htmlmixed/htmlmixed.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -14,7 +14,7 @@
var defaultTags = {
script: [
["lang", /(javascript|babel)/i, "javascript"],
- ["type", /^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^$/i, "javascript"],
+ ["type", /^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^module$|^$/i, "javascript"],
["type", /./, "text/plain"],
[null, null, "javascript"]
],
@@ -46,7 +46,7 @@
function getAttrValue(text, attr) {
var match = text.match(getAttrRegexp(attr))
- return match ? match[2] : ""
+ return match ? /^\s*(.*?)\s*$/.exec(match[2])[1] : ""
}
function getTagRegexp(tagName, anchored) {
@@ -105,7 +105,7 @@
return maybeBackup(stream, endTag, state.localMode.token(stream, state.localState));
};
state.localMode = mode;
- state.localState = CodeMirror.startState(mode, htmlMode.indent(state.htmlState, ""));
+ state.localState = CodeMirror.startState(mode, htmlMode.indent(state.htmlState, "", ""));
} else if (state.inTag) {
state.inTag += stream.current()
if (stream.eol()) state.inTag += " "
@@ -133,11 +133,11 @@
return state.token(stream, state);
},
- indent: function (state, textAfter) {
+ indent: function (state, textAfter, line) {
if (!state.localMode || /^\s*<\//.test(textAfter))
- return htmlMode.indent(state.htmlState, textAfter);
+ return htmlMode.indent(state.htmlState, textAfter, line);
else if (state.localMode.indent)
- return state.localMode.indent(state.localState, textAfter);
+ return state.localMode.indent(state.localState, textAfter, line);
else
return CodeMirror.Pass;
},
diff --git a/public/vendor/plugins/codemirror/mode/htmlmixed/index.html b/public/vendor/plugins/codemirror/mode/htmlmixed/index.html
index f94df9e21a..7de1e03503 100644
--- a/public/vendor/plugins/codemirror/mode/htmlmixed/index.html
+++ b/public/vendor/plugins/codemirror/mode/htmlmixed/index.html
@@ -14,7 +14,7 @@
- Home
diff --git a/public/vendor/plugins/codemirror/mode/htmlembedded/htmlembedded.js b/public/vendor/plugins/codemirror/mode/htmlembedded/htmlembedded.js
index 464dc57f83..439e63a427 100644
--- a/public/vendor/plugins/codemirror/mode/htmlembedded/htmlembedded.js
+++ b/public/vendor/plugins/codemirror/mode/htmlembedded/htmlembedded.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -14,7 +14,16 @@
"use strict";
CodeMirror.defineMode("htmlembedded", function(config, parserConfig) {
+ var closeComment = parserConfig.closeComment || "--%>"
return CodeMirror.multiplexingMode(CodeMirror.getMode(config, "htmlmixed"), {
+ open: parserConfig.openComment || "<%--",
+ close: closeComment,
+ delimStyle: "comment",
+ mode: {token: function(stream) {
+ stream.skipTo(closeComment) || stream.skipToEnd()
+ return "comment"
+ }}
+ }, {
open: parserConfig.open || parserConfig.scriptStartRegex || "<%",
close: parserConfig.close || parserConfig.scriptEndRegex || "%>",
mode: CodeMirror.getMode(config, parserConfig.scriptingModeSpec)
diff --git a/public/vendor/plugins/codemirror/mode/htmlembedded/index.html b/public/vendor/plugins/codemirror/mode/htmlembedded/index.html
index 9ed33cffef..4257237af1 100644
--- a/public/vendor/plugins/codemirror/mode/htmlembedded/index.html
+++ b/public/vendor/plugins/codemirror/mode/htmlembedded/index.html
@@ -12,9 +12,9 @@
-
+
-CodeMirror
+ CodeMirror
- Home
diff --git a/public/vendor/plugins/codemirror/mode/haxe/haxe.js b/public/vendor/plugins/codemirror/mode/haxe/haxe.js
index a9573dd71b..45376852a6 100644
--- a/public/vendor/plugins/codemirror/mode/haxe/haxe.js
+++ b/public/vendor/plugins/codemirror/mode/haxe/haxe.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -485,7 +485,7 @@ CodeMirror.defineMode("hxml", function () {
if (state.inString == false && ch == "'") {
state.inString = true;
- ch = stream.next();
+ stream.next();
}
if (state.inString == true) {
diff --git a/public/vendor/plugins/codemirror/mode/haxe/index.html b/public/vendor/plugins/codemirror/mode/haxe/index.html
index d415b5e109..89dacdfb59 100644
--- a/public/vendor/plugins/codemirror/mode/haxe/index.html
+++ b/public/vendor/plugins/codemirror/mode/haxe/index.html
@@ -7,9 +7,9 @@
-
+
- Home
@@ -40,6 +41,8 @@
{{! one line comment }}
+{{{propertyContainingRawHtml}}}
+
{{#each articles}}
{{~title}}
- Home
diff --git a/public/vendor/plugins/codemirror/mode/haml/test.js b/public/vendor/plugins/codemirror/mode/haml/test.js
index 508458a437..e051452738 100644
--- a/public/vendor/plugins/codemirror/mode/haml/test.js
+++ b/public/vendor/plugins/codemirror/mode/haml/test.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function() {
var mode = CodeMirror.getMode({tabSize: 4, indentUnit: 2}, "haml");
diff --git a/public/vendor/plugins/codemirror/mode/handlebars/handlebars.js b/public/vendor/plugins/codemirror/mode/handlebars/handlebars.js
index 2174e53849..fe8b3b44e8 100644
--- a/public/vendor/plugins/codemirror/mode/handlebars/handlebars.js
+++ b/public/vendor/plugins/codemirror/mode/handlebars/handlebars.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -13,10 +13,14 @@
CodeMirror.defineSimpleMode("handlebars-tags", {
start: [
+ { regex: /\{\{\{/, push: "handlebars_raw", token: "tag" },
{ regex: /\{\{!--/, push: "dash_comment", token: "comment" },
{ regex: /\{\{!/, push: "comment", token: "comment" },
{ regex: /\{\{/, push: "handlebars", token: "tag" }
],
+ handlebars_raw: [
+ { regex: /\}\}\}/, pop: true, token: "tag" },
+ ],
handlebars: [
{ regex: /\}\}/, pop: true, token: "tag" },
@@ -46,7 +50,11 @@
comment: [
{ regex: /\}\}/, pop: true, token: "comment" },
{ regex: /./, token: "comment" }
- ]
+ ],
+ meta: {
+ blockCommentStart: "{{--",
+ blockCommentEnd: "--}}"
+ }
});
CodeMirror.defineMode("handlebars", function(config, parserConfig) {
diff --git a/public/vendor/plugins/codemirror/mode/handlebars/index.html b/public/vendor/plugins/codemirror/mode/handlebars/index.html
index b1bfad1ca3..e2da2e766f 100644
--- a/public/vendor/plugins/codemirror/mode/handlebars/index.html
+++ b/public/vendor/plugins/codemirror/mode/handlebars/index.html
@@ -8,11 +8,12 @@
+
- Home
diff --git a/public/vendor/plugins/codemirror/mode/haml/haml.js b/public/vendor/plugins/codemirror/mode/haml/haml.js
index 20ae1e19ca..3c8f505eb5 100644
--- a/public/vendor/plugins/codemirror/mode/haml/haml.js
+++ b/public/vendor/plugins/codemirror/mode/haml/haml.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/public/vendor/plugins/codemirror/mode/haml/index.html b/public/vendor/plugins/codemirror/mode/haml/index.html
index 2894a938e8..ba3ea3062c 100644
--- a/public/vendor/plugins/codemirror/mode/haml/index.html
+++ b/public/vendor/plugins/codemirror/mode/haml/index.html
@@ -13,7 +13,7 @@
- Home
diff --git a/public/vendor/plugins/codemirror/mode/groovy/groovy.js b/public/vendor/plugins/codemirror/mode/groovy/groovy.js
index 721933b01c..2b90d01c43 100644
--- a/public/vendor/plugins/codemirror/mode/groovy/groovy.js
+++ b/public/vendor/plugins/codemirror/mode/groovy/groovy.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -21,9 +21,9 @@ CodeMirror.defineMode("groovy", function(config) {
"abstract as assert boolean break byte case catch char class const continue def default " +
"do double else enum extends final finally float for goto if implements import in " +
"instanceof int interface long native new package private protected public return " +
- "short static strictfp super switch synchronized threadsafe throw throws transient " +
+ "short static strictfp super switch synchronized threadsafe throw throws trait transient " +
"try void volatile while");
- var blockKeywords = words("catch class do else finally for if switch try while enum interface def");
+ var blockKeywords = words("catch class def do else enum finally for if interface switch trait try while");
var standaloneKeywords = words("return break continue");
var atoms = words("null true false this");
@@ -210,7 +210,7 @@ CodeMirror.defineMode("groovy", function(config) {
},
indent: function(state, textAfter) {
- if (!state.tokenize[state.tokenize.length-1].isBase) return 0;
+ if (!state.tokenize[state.tokenize.length-1].isBase) return CodeMirror.Pass;
var firstChar = textAfter && textAfter.charAt(0), ctx = state.context;
if (ctx.type == "statement" && !expectExpression(state.lastToken, true)) ctx = ctx.prev;
var closing = firstChar == ctx.type;
@@ -221,7 +221,10 @@ CodeMirror.defineMode("groovy", function(config) {
electricChars: "{}",
closeBrackets: {triples: "'\""},
- fold: "brace"
+ fold: "brace",
+ blockCommentStart: "/*",
+ blockCommentEnd: "*/",
+ lineComment: "//"
};
});
diff --git a/public/vendor/plugins/codemirror/mode/groovy/index.html b/public/vendor/plugins/codemirror/mode/groovy/index.html
index bb0df078c3..3e022fdf09 100644
--- a/public/vendor/plugins/codemirror/mode/groovy/index.html
+++ b/public/vendor/plugins/codemirror/mode/groovy/index.html
@@ -10,7 +10,7 @@
- Home
diff --git a/public/vendor/plugins/codemirror/mode/go/go.js b/public/vendor/plugins/codemirror/mode/go/go.js
index 3c9ef6b989..c005e42ddc 100644
--- a/public/vendor/plugins/codemirror/mode/go/go.js
+++ b/public/vendor/plugins/codemirror/mode/go/go.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -23,12 +23,13 @@ CodeMirror.defineMode("go", function(config) {
"bool":true, "byte":true, "complex64":true, "complex128":true,
"float32":true, "float64":true, "int8":true, "int16":true, "int32":true,
"int64":true, "string":true, "uint8":true, "uint16":true, "uint32":true,
- "uint64":true, "int":true, "uint":true, "uintptr":true, "error": true
+ "uint64":true, "int":true, "uint":true, "uintptr":true, "error": true,
+ "rune":true
};
var atoms = {
"true":true, "false":true, "iota":true, "nil":true, "append":true,
- "cap":true, "close":true, "complex":true, "copy":true, "imag":true,
+ "cap":true, "close":true, "complex":true, "copy":true, "delete":true, "imag":true,
"len":true, "make":true, "new":true, "panic":true, "print":true,
"println":true, "real":true, "recover":true
};
@@ -154,14 +155,14 @@ CodeMirror.defineMode("go", function(config) {
else if (curPunc == "[") pushContext(state, stream.column(), "]");
else if (curPunc == "(") pushContext(state, stream.column(), ")");
else if (curPunc == "case") ctx.type = "case";
- else if (curPunc == "}" && ctx.type == "}") ctx = popContext(state);
+ else if (curPunc == "}" && ctx.type == "}") popContext(state);
else if (curPunc == ctx.type) popContext(state);
state.startOfLine = false;
return style;
},
indent: function(state, textAfter) {
- if (state.tokenize != tokenBase && state.tokenize != null) return 0;
+ if (state.tokenize != tokenBase && state.tokenize != null) return CodeMirror.Pass;
var ctx = state.context, firstChar = textAfter && textAfter.charAt(0);
if (ctx.type == "case" && /^(?:case|default)\b/.test(textAfter)) {
state.context.type = "}";
@@ -173,6 +174,7 @@ CodeMirror.defineMode("go", function(config) {
},
electricChars: "{}):",
+ closeBrackets: "()[]{}''\"\"``",
fold: "brace",
blockCommentStart: "/*",
blockCommentEnd: "*/",
diff --git a/public/vendor/plugins/codemirror/mode/go/index.html b/public/vendor/plugins/codemirror/mode/go/index.html
index 72e3b364c6..4489211043 100644
--- a/public/vendor/plugins/codemirror/mode/go/index.html
+++ b/public/vendor/plugins/codemirror/mode/go/index.html
@@ -11,7 +11,7 @@
- Home
@@ -67,6 +70,10 @@ for (var i = 0; i < items.length; i++) {
## A bit of GitHub spice
+See http://github.github.com/github-flavored-markdown/.
+
+(Set `gitHubSpice: false` in mode options to disable):
+
* SHA: be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2
* User@SHA ref: mojombo@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2
* User/Project@SHA: mojombo/god@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2
@@ -74,13 +81,21 @@ for (var i = 0; i < items.length; i++) {
* User/#Num: mojombo#1
* User/Project#Num: mojombo/god#1
-See http://github.github.com/github-flavored-markdown/.
+(Set `emoji: false` in mode options to disable):
+
+* emoji: :smile:
+
- Home
diff --git a/public/vendor/plugins/codemirror/mode/gfm/gfm.js b/public/vendor/plugins/codemirror/mode/gfm/gfm.js
index 6e74ad4fd6..492c9487a6 100644
--- a/public/vendor/plugins/codemirror/mode/gfm/gfm.js
+++ b/public/vendor/plugins/codemirror/mode/gfm/gfm.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -81,7 +81,7 @@ CodeMirror.defineMode("gfm", function(config, modeConfig) {
if (stream.sol() || state.ateSpace) {
state.ateSpace = false;
if (modeConfig.gitHubSpice !== false) {
- if(stream.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+@)?(?:[a-f0-9]{7,40}\b)/)) {
+ if(stream.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+@)?(?=.{0,6}\d)(?:[a-f0-9]{7,40}\b)/)) {
// User/Project@SHA
// User@SHA
// SHA
@@ -113,10 +113,9 @@ CodeMirror.defineMode("gfm", function(config, modeConfig) {
};
var markdownConfig = {
- underscoresBreakWords: false,
taskLists: true,
- fencedCodeBlocks: '```',
- strikethrough: true
+ strikethrough: true,
+ emoji: true
};
for (var attr in modeConfig) {
markdownConfig[attr] = modeConfig[attr];
diff --git a/public/vendor/plugins/codemirror/mode/gfm/index.html b/public/vendor/plugins/codemirror/mode/gfm/index.html
index 24c90c068e..8f6fb8ea80 100644
--- a/public/vendor/plugins/codemirror/mode/gfm/index.html
+++ b/public/vendor/plugins/codemirror/mode/gfm/index.html
@@ -15,9 +15,12 @@
-
+
- Home
diff --git a/public/vendor/plugins/codemirror/mode/gas/gas.js b/public/vendor/plugins/codemirror/mode/gas/gas.js
index 0c74bedc57..e34d7a7b61 100644
--- a/public/vendor/plugins/codemirror/mode/gas/gas.js
+++ b/public/vendor/plugins/codemirror/mode/gas/gas.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/public/vendor/plugins/codemirror/mode/gas/index.html b/public/vendor/plugins/codemirror/mode/gas/index.html
index df75ca2db7..34eea72da4 100644
--- a/public/vendor/plugins/codemirror/mode/gas/index.html
+++ b/public/vendor/plugins/codemirror/mode/gas/index.html
@@ -9,7 +9,7 @@
- Home
diff --git a/public/vendor/plugins/codemirror/mode/fortran/fortran.js b/public/vendor/plugins/codemirror/mode/fortran/fortran.js
index 4d88f006aa..85bacc42c1 100644
--- a/public/vendor/plugins/codemirror/mode/fortran/fortran.js
+++ b/public/vendor/plugins/codemirror/mode/fortran/fortran.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/public/vendor/plugins/codemirror/mode/fortran/index.html b/public/vendor/plugins/codemirror/mode/fortran/index.html
index 9aed0efccc..a799e937f1 100644
--- a/public/vendor/plugins/codemirror/mode/fortran/index.html
+++ b/public/vendor/plugins/codemirror/mode/fortran/index.html
@@ -7,9 +7,9 @@
-
+
- Home
diff --git a/public/vendor/plugins/codemirror/mode/forth/forth.js b/public/vendor/plugins/codemirror/mode/forth/forth.js
index 1f519d8862..f2caa27af8 100644
--- a/public/vendor/plugins/codemirror/mode/forth/forth.js
+++ b/public/vendor/plugins/codemirror/mode/forth/forth.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
// Author: Aliaksei Chapyzhenka
diff --git a/public/vendor/plugins/codemirror/mode/forth/index.html b/public/vendor/plugins/codemirror/mode/forth/index.html
index ae8cd34584..470363f48f 100644
--- a/public/vendor/plugins/codemirror/mode/forth/index.html
+++ b/public/vendor/plugins/codemirror/mode/forth/index.html
@@ -16,7 +16,7 @@
}
- Home
diff --git a/public/vendor/plugins/codemirror/mode/fcl/fcl.js b/public/vendor/plugins/codemirror/mode/fcl/fcl.js
index 518116976a..2d3f2001d3 100644
--- a/public/vendor/plugins/codemirror/mode/fcl/fcl.js
+++ b/public/vendor/plugins/codemirror/mode/fcl/fcl.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/public/vendor/plugins/codemirror/mode/fcl/index.html b/public/vendor/plugins/codemirror/mode/fcl/index.html
index 3c18d0b3c7..7ea0fd15f8 100644
--- a/public/vendor/plugins/codemirror/mode/fcl/index.html
+++ b/public/vendor/plugins/codemirror/mode/fcl/index.html
@@ -11,7 +11,7 @@
- Home
diff --git a/public/vendor/plugins/codemirror/mode/factor/factor.js b/public/vendor/plugins/codemirror/mode/factor/factor.js
index 86d7adf627..7108278cca 100644
--- a/public/vendor/plugins/codemirror/mode/factor/factor.js
+++ b/public/vendor/plugins/codemirror/mode/factor/factor.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
// Factor syntax highlight - simple mode
//
@@ -22,52 +22,54 @@
{regex: /#?!.*/, token: "comment"},
// strings """, multiline --> state
{regex: /"""/, token: "string", next: "string3"},
- {regex: /"/, token: "string", next: "string"},
+ {regex: /(STRING:)(\s)/, token: ["keyword", null], next: "string2"},
+ {regex: /\S*?"/, token: "string", next: "string"},
// numbers: dec, hex, unicode, bin, fractional, complex
- {regex: /(?:[+-]?)(?:0x[\d,a-f]+)|(?:0o[0-7]+)|(?:0b[0,1]+)|(?:\d+.?\d*)/, token: "number"},
+ {regex: /(?:0x[\d,a-f]+)|(?:0o[0-7]+)|(?:0b[0,1]+)|(?:\-?\d+.?\d*)(?=\s)/, token: "number"},
//{regex: /[+-]?/} //fractional
// definition: defining word, defined word, etc
- {regex: /(\:)(\s+)(\S+)(\s+)(\()/, token: ["keyword", null, "def", null, "keyword"], next: "stack"},
+ {regex: /((?:GENERIC)|\:?\:)(\s+)(\S+)(\s+)(\()/, token: ["keyword", null, "def", null, "bracket"], next: "stack"},
+ // method definition: defining word, type, defined word, etc
+ {regex: /(M\:)(\s+)(\S+)(\s+)(\S+)/, token: ["keyword", null, "def", null, "tag"]},
// vocabulary using --> state
{regex: /USING\:/, token: "keyword", next: "vocabulary"},
// vocabulary definition/use
- {regex: /(USE\:|IN\:)(\s+)(\S+)/, token: ["keyword", null, "variable-2"]},
- //
- Home
diff --git a/public/vendor/plugins/codemirror/mode/erlang/erlang.js b/public/vendor/plugins/codemirror/mode/erlang/erlang.js
index 5aed76a526..f0541bb955 100644
--- a/public/vendor/plugins/codemirror/mode/erlang/erlang.js
+++ b/public/vendor/plugins/codemirror/mode/erlang/erlang.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
/*jshint unused:true, eqnull:true, curly:true, bitwise:true */
/*jshint undef:true, latedef:true, trailing:true */
@@ -433,15 +433,16 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
}
function maybe_drop_post(s) {
+ if (!s.length) return s
var last = s.length-1;
if (s[last].type === "dot") {
return [];
}
- if (s[last].type === "fun" && s[last-1].token === "fun") {
+ if (last > 1 && s[last].type === "fun" && s[last-1].token === "fun") {
return s.slice(0,last-1);
}
- switch (s[s.length-1].token) {
+ switch (s[last].token) {
case "}": return d(s,{g:["{"]});
case "]": return d(s,{i:["["]});
case ")": return d(s,{i:["("]});
diff --git a/public/vendor/plugins/codemirror/mode/erlang/index.html b/public/vendor/plugins/codemirror/mode/erlang/index.html
index 6d06a890a2..5f54c0fe98 100644
--- a/public/vendor/plugins/codemirror/mode/erlang/index.html
+++ b/public/vendor/plugins/codemirror/mode/erlang/index.html
@@ -9,9 +9,9 @@
-
+
- Home
diff --git a/public/vendor/plugins/codemirror/mode/elm/elm.js b/public/vendor/plugins/codemirror/mode/elm/elm.js
index b31e663757..fe8dd497f4 100644
--- a/public/vendor/plugins/codemirror/mode/elm/elm.js
+++ b/public/vendor/plugins/codemirror/mode/elm/elm.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -70,7 +70,7 @@
if (smallRE.test(ch)) {
var isDef = source.pos === 1;
source.eatWhile(idRE);
- return isDef ? "variable-3" : "variable";
+ return isDef ? "type" : "variable";
}
if (digitRE.test(ch)) {
diff --git a/public/vendor/plugins/codemirror/mode/elm/index.html b/public/vendor/plugins/codemirror/mode/elm/index.html
index d5cb16abfb..9bef08a8e3 100644
--- a/public/vendor/plugins/codemirror/mode/elm/index.html
+++ b/public/vendor/plugins/codemirror/mode/elm/index.html
@@ -7,9 +7,9 @@
-
+
- Home
diff --git a/public/vendor/plugins/codemirror/mode/eiffel/eiffel.js b/public/vendor/plugins/codemirror/mode/eiffel/eiffel.js
index b8b70e36e5..f6f3f458b6 100644
--- a/public/vendor/plugins/codemirror/mode/eiffel/eiffel.js
+++ b/public/vendor/plugins/codemirror/mode/eiffel/eiffel.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/public/vendor/plugins/codemirror/mode/eiffel/index.html b/public/vendor/plugins/codemirror/mode/eiffel/index.html
index 108a71bec8..568fbb79bb 100644
--- a/public/vendor/plugins/codemirror/mode/eiffel/index.html
+++ b/public/vendor/plugins/codemirror/mode/eiffel/index.html
@@ -13,7 +13,7 @@
.cm-s-default span.cm-arrow { color: red; }
- Home
diff --git a/public/vendor/plugins/codemirror/mode/ecl/ecl.js b/public/vendor/plugins/codemirror/mode/ecl/ecl.js
index 8df7ebe4ab..9af8aee180 100644
--- a/public/vendor/plugins/codemirror/mode/ecl/ecl.js
+++ b/public/vendor/plugins/codemirror/mode/ecl/ecl.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/public/vendor/plugins/codemirror/mode/ecl/index.html b/public/vendor/plugins/codemirror/mode/ecl/index.html
index 2306860dcb..1acaec332f 100644
--- a/public/vendor/plugins/codemirror/mode/ecl/index.html
+++ b/public/vendor/plugins/codemirror/mode/ecl/index.html
@@ -9,7 +9,7 @@
- Home
diff --git a/public/vendor/plugins/codemirror/mode/dylan/test.js b/public/vendor/plugins/codemirror/mode/dylan/test.js
index bf25be27e1..8b121b9133 100644
--- a/public/vendor/plugins/codemirror/mode/dylan/test.js
+++ b/public/vendor/plugins/codemirror/mode/dylan/test.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function() {
var mode = CodeMirror.getMode({indentUnit: 2}, "dylan");
diff --git a/public/vendor/plugins/codemirror/mode/ebnf/ebnf.js b/public/vendor/plugins/codemirror/mode/ebnf/ebnf.js
index 9618f8e42b..238bbe23bf 100644
--- a/public/vendor/plugins/codemirror/mode/ebnf/ebnf.js
+++ b/public/vendor/plugins/codemirror/mode/ebnf/ebnf.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/public/vendor/plugins/codemirror/mode/ebnf/index.html b/public/vendor/plugins/codemirror/mode/ebnf/index.html
index 13845629b3..9bd28a4adf 100644
--- a/public/vendor/plugins/codemirror/mode/ebnf/index.html
+++ b/public/vendor/plugins/codemirror/mode/ebnf/index.html
@@ -9,11 +9,11 @@
-
+
- Home
diff --git a/public/vendor/plugins/codemirror/mode/dylan/dylan.js b/public/vendor/plugins/codemirror/mode/dylan/dylan.js
index 1b46bc8284..6725edccc0 100644
--- a/public/vendor/plugins/codemirror/mode/dylan/dylan.js
+++ b/public/vendor/plugins/codemirror/mode/dylan/dylan.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -11,6 +11,14 @@
})(function(CodeMirror) {
"use strict";
+function forEach(arr, f) {
+ for (var i = 0; i < arr.length; i++) f(arr[i], i)
+}
+function some(arr, f) {
+ for (var i = 0; i < arr.length; i++) if (f(arr[i], i)) return true
+ return false
+}
+
CodeMirror.defineMode("dylan", function(_config) {
// Words
var words = {
@@ -136,13 +144,13 @@ CodeMirror.defineMode("dylan", function(_config) {
var wordLookup = {};
var styleLookup = {};
- [
+ forEach([
"keyword",
"definition",
"simpleDefinition",
"signalingCalls"
- ].forEach(function(type) {
- words[type].forEach(function(word) {
+ ], function(type) {
+ forEach(words[type], function(word) {
wordLookup[word] = type;
styleLookup[word] = styles[type];
});
@@ -258,7 +266,7 @@ CodeMirror.defineMode("dylan", function(_config) {
for (var name in patterns) {
if (patterns.hasOwnProperty(name)) {
var pattern = patterns[name];
- if ((pattern instanceof Array && pattern.some(function(p) {
+ if ((pattern instanceof Array && some(pattern, function(p) {
return stream.match(p);
})) || stream.match(pattern))
return patternStyles[name];
@@ -273,7 +281,7 @@ CodeMirror.defineMode("dylan", function(_config) {
} else {
stream.eatWhile(/[\w\-]/);
// Keyword
- if (wordLookup[stream.current()]) {
+ if (wordLookup.hasOwnProperty(stream.current())) {
return styleLookup[stream.current()];
} else if (stream.current().match(symbol)) {
return "variable";
diff --git a/public/vendor/plugins/codemirror/mode/dylan/index.html b/public/vendor/plugins/codemirror/mode/dylan/index.html
index ddf5ad067d..af259528cb 100644
--- a/public/vendor/plugins/codemirror/mode/dylan/index.html
+++ b/public/vendor/plugins/codemirror/mode/dylan/index.html
@@ -10,9 +10,9 @@
-
+
- Home
diff --git a/public/vendor/plugins/codemirror/mode/dockerfile/test.js b/public/vendor/plugins/codemirror/mode/dockerfile/test.js
new file mode 100644
index 0000000000..51add3ce9c
--- /dev/null
+++ b/public/vendor/plugins/codemirror/mode/dockerfile/test.js
@@ -0,0 +1,128 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function() {
+ var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-dockerfile");
+ function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+ MT("simple_nodejs_dockerfile",
+ "[keyword FROM] node:carbon",
+ "[comment # Create app directory]",
+ "[keyword WORKDIR] /usr/src/app",
+ "[comment # Install app dependencies]",
+ "[comment # A wildcard is used to ensure both package.json AND package-lock.json are copied]",
+ "[comment # where available (npm@5+)]",
+ "[keyword COPY] package*.json ./",
+ "[keyword RUN] npm install",
+ "[keyword COPY] . .",
+ "[keyword EXPOSE] [number 8080] [number 3000]",
+ "[keyword ENV] NODE_ENV development",
+ "[keyword CMD] [[ [string \"npm\"], [string \"start\"] ]]");
+
+ // Ideally the last space should not be highlighted.
+ MT("instruction_without_args_1",
+ "[keyword CMD] ");
+
+ MT("instruction_without_args_2",
+ "[comment # An instruction without args...]",
+ "[keyword ARG] [error #...is an error]");
+
+ MT("multiline",
+ "[keyword RUN] apt-get update && apt-get install -y \\",
+ " mercurial \\",
+ " subversion \\",
+ " && apt-get clean \\",
+ " && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*");
+
+ MT("from_comment",
+ " [keyword FROM] debian:stretch # I tend to use stable as that is more stable",
+ " [keyword FROM] debian:stretch [keyword AS] stable # I am even more stable",
+ " [keyword FROM] [error # this is an error]");
+
+ MT("from_as",
+ "[keyword FROM] golang:1.9.2-alpine3.6 [keyword AS] build",
+ "[keyword COPY] --from=build /bin/project /bin/project",
+ "[keyword ENTRYPOINT] [[ [string \"/bin/project\"] ]]",
+ "[keyword CMD] [[ [string \"--help\"] ]]");
+
+ MT("arg",
+ "[keyword ARG] VERSION=latest",
+ "[keyword FROM] busybox:$VERSION",
+ "[keyword ARG] VERSION",
+ "[keyword RUN] echo $VERSION > image_version");
+
+ MT("label",
+ "[keyword LABEL] com.example.label-with-value=[string \"foo\"]");
+
+ MT("label_multiline",
+ "[keyword LABEL] description=[string \"This text illustrates ]\\",
+ "[string that label-values can span multiple lines.\"]");
+
+ MT("maintainer",
+ "[keyword MAINTAINER] Foo Bar [string \"foo@bar.com\"] ",
+ "[keyword MAINTAINER] Bar Baz
- Home
diff --git a/public/vendor/plugins/codemirror/mode/dockerfile/dockerfile.js b/public/vendor/plugins/codemirror/mode/dockerfile/dockerfile.js
index 4419009afa..983170f519 100644
--- a/public/vendor/plugins/codemirror/mode/dockerfile/dockerfile.js
+++ b/public/vendor/plugins/codemirror/mode/dockerfile/dockerfile.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -11,30 +11,64 @@
})(function(CodeMirror) {
"use strict";
+ var from = "from";
+ var fromRegex = new RegExp("^(\\s*)\\b(" + from + ")\\b", "i");
+
+ var shells = ["run", "cmd", "entrypoint", "shell"];
+ var shellsAsArrayRegex = new RegExp("^(\\s*)(" + shells.join('|') + ")(\\s+\\[)", "i");
+
+ var expose = "expose";
+ var exposeRegex = new RegExp("^(\\s*)(" + expose + ")(\\s+)", "i");
+
+ var others = [
+ "arg", "from", "maintainer", "label", "env",
+ "add", "copy", "volume", "user",
+ "workdir", "onbuild", "stopsignal", "healthcheck", "shell"
+ ];
+
// Collect all Dockerfile directives
- var instructions = ["from", "maintainer", "run", "cmd", "expose", "env",
- "add", "copy", "entrypoint", "volume", "user",
- "workdir", "onbuild"],
+ var instructions = [from, expose].concat(shells).concat(others),
instructionRegex = "(" + instructions.join('|') + ")",
- instructionOnlyLine = new RegExp(instructionRegex + "\\s*$", "i"),
- instructionWithArguments = new RegExp(instructionRegex + "(\\s+)", "i");
+ instructionOnlyLine = new RegExp("^(\\s*)" + instructionRegex + "(\\s*)(#.*)?$", "i"),
+ instructionWithArguments = new RegExp("^(\\s*)" + instructionRegex + "(\\s+)", "i");
CodeMirror.defineSimpleMode("dockerfile", {
start: [
// Block comment: This is a line starting with a comment
{
- regex: /#.*$/,
+ regex: /^\s*#.*$/,
+ sol: true,
token: "comment"
},
+ {
+ regex: fromRegex,
+ token: [null, "keyword"],
+ sol: true,
+ next: "from"
+ },
// Highlight an instruction without any arguments (for convenience)
{
regex: instructionOnlyLine,
- token: "variable-2"
+ token: [null, "keyword", null, "error"],
+ sol: true
+ },
+ {
+ regex: shellsAsArrayRegex,
+ token: [null, "keyword", null],
+ sol: true,
+ next: "array"
+ },
+ {
+ regex: exposeRegex,
+ token: [null, "keyword", null],
+ sol: true,
+ next: "expose"
},
// Highlight an instruction followed by arguments
{
regex: instructionWithArguments,
- token: ["variable-2", null],
+ token: [null, "keyword", null],
+ sol: true,
next: "arguments"
},
{
@@ -42,26 +76,21 @@
token: null
}
],
- arguments: [
+ from: [
+ {
+ regex: /\s*$/,
+ token: null,
+ next: "start"
+ },
{
// Line comment without instruction arguments is an error
- regex: /#.*$/,
- token: "error",
+ regex: /(\s*)(#.*)$/,
+ token: [null, "error"],
next: "start"
},
{
- regex: /[^#]+\\$/,
- token: null
- },
- {
- // Match everything except for the inline comment
- regex: /[^#]+/,
- token: null,
- next: "start"
- },
- {
- regex: /$/,
- token: null,
+ regex: /(\s*\S+\s+)(as)/i,
+ token: [null, "keyword"],
next: "start"
},
// Fail safe return to start
@@ -70,9 +99,112 @@
next: "start"
}
],
- meta: {
- lineComment: "#"
+ single: [
+ {
+ regex: /(?:[^\\']|\\.)/,
+ token: "string"
+ },
+ {
+ regex: /'/,
+ token: "string",
+ pop: true
}
+ ],
+ double: [
+ {
+ regex: /(?:[^\\"]|\\.)/,
+ token: "string"
+ },
+ {
+ regex: /"/,
+ token: "string",
+ pop: true
+ }
+ ],
+ array: [
+ {
+ regex: /\]/,
+ token: null,
+ next: "start"
+ },
+ {
+ regex: /"(?:[^\\"]|\\.)*"?/,
+ token: "string"
+ }
+ ],
+ expose: [
+ {
+ regex: /\d+$/,
+ token: "number",
+ next: "start"
+ },
+ {
+ regex: /[^\d]+$/,
+ token: null,
+ next: "start"
+ },
+ {
+ regex: /\d+/,
+ token: "number"
+ },
+ {
+ regex: /[^\d]+/,
+ token: null
+ },
+ // Fail safe return to start
+ {
+ token: null,
+ next: "start"
+ }
+ ],
+ arguments: [
+ {
+ regex: /^\s*#.*$/,
+ sol: true,
+ token: "comment"
+ },
+ {
+ regex: /"(?:[^\\"]|\\.)*"?$/,
+ token: "string",
+ next: "start"
+ },
+ {
+ regex: /"/,
+ token: "string",
+ push: "double"
+ },
+ {
+ regex: /'(?:[^\\']|\\.)*'?$/,
+ token: "string",
+ next: "start"
+ },
+ {
+ regex: /'/,
+ token: "string",
+ push: "single"
+ },
+ {
+ regex: /[^#"']+[\\`]$/,
+ token: null
+ },
+ {
+ regex: /[^#"']+$/,
+ token: null,
+ next: "start"
+ },
+ {
+ regex: /[^#"']+/,
+ token: null
+ },
+ // Fail safe return to start
+ {
+ token: null,
+ next: "start"
+ }
+ ],
+ meta: {
+ lineComment: "#"
+ }
});
CodeMirror.defineMIME("text/x-dockerfile", "dockerfile");
diff --git a/public/vendor/plugins/codemirror/mode/dockerfile/index.html b/public/vendor/plugins/codemirror/mode/dockerfile/index.html
index a31759bce1..63bb91e6ec 100644
--- a/public/vendor/plugins/codemirror/mode/dockerfile/index.html
+++ b/public/vendor/plugins/codemirror/mode/dockerfile/index.html
@@ -8,9 +8,9 @@
-
+
- Home
diff --git a/public/vendor/plugins/codemirror/mode/django/django.js b/public/vendor/plugins/codemirror/mode/django/django.js
index 7b4ef3b566..07be123986 100644
--- a/public/vendor/plugins/codemirror/mode/django/django.js
+++ b/public/vendor/plugins/codemirror/mode/django/django.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/public/vendor/plugins/codemirror/mode/django/index.html b/public/vendor/plugins/codemirror/mode/django/index.html
index 41ea07c91b..384e0067be 100644
--- a/public/vendor/plugins/codemirror/mode/django/index.html
+++ b/public/vendor/plugins/codemirror/mode/django/index.html
@@ -11,9 +11,9 @@
-
+
- Home
diff --git a/public/vendor/plugins/codemirror/mode/diff/diff.js b/public/vendor/plugins/codemirror/mode/diff/diff.js
index fe0305e7b6..a30fd37a50 100644
--- a/public/vendor/plugins/codemirror/mode/diff/diff.js
+++ b/public/vendor/plugins/codemirror/mode/diff/diff.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/public/vendor/plugins/codemirror/mode/diff/index.html b/public/vendor/plugins/codemirror/mode/diff/index.html
index 0af611fa48..5c7ef7dee0 100644
--- a/public/vendor/plugins/codemirror/mode/diff/index.html
+++ b/public/vendor/plugins/codemirror/mode/diff/index.html
@@ -15,7 +15,7 @@
span.cm-error.cm-tag { background-color: #2b2; }
- Home
diff --git a/public/vendor/plugins/codemirror/mode/d/test.js b/public/vendor/plugins/codemirror/mode/d/test.js
new file mode 100644
index 0000000000..f8ac9de1c8
--- /dev/null
+++ b/public/vendor/plugins/codemirror/mode/d/test.js
@@ -0,0 +1,11 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function() {
+ var mode = CodeMirror.getMode({indentUnit: 2}, "d");
+ function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+ MT("nested_comments",
+ "[comment /+]","[comment comment]","[comment +/]","[variable void] [variable main](){}");
+
+})();
diff --git a/public/vendor/plugins/codemirror/mode/dart/dart.js b/public/vendor/plugins/codemirror/mode/dart/dart.js
index 8d383a95ef..7b154c65c0 100644
--- a/public/vendor/plugins/codemirror/mode/dart/dart.js
+++ b/public/vendor/plugins/codemirror/mode/dart/dart.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -12,8 +12,8 @@
"use strict";
var keywords = ("this super static final const abstract class extends external factory " +
- "implements get native operator set typedef with enum throw rethrow " +
- "assert break case continue default in return new deferred async await " +
+ "implements mixin get native set typedef with enum throw rethrow " +
+ "assert break case continue default in return new deferred async await covariant " +
"try catch finally do else for if switch while import library export " +
"part of show hide is as").split(" ");
var blockKeywords = "try catch finally do else for if switch while".split(" ");
@@ -78,6 +78,15 @@
if (!stream.eat("*")) return false
state.tokenize = tokenNestedComment(1)
return state.tokenize(stream, state)
+ },
+ token: function(stream, _, style) {
+ if (style == "variable") {
+ // Assume uppercase symbols are classes using variable-2
+ var isUpper = RegExp('^[_$]*[A-Z][a-zA-Z0-9_$]*$','g');
+ if (isUpper.test(stream.current())) {
+ return 'variable-2';
+ }
+ }
}
}
});
diff --git a/public/vendor/plugins/codemirror/mode/dart/index.html b/public/vendor/plugins/codemirror/mode/dart/index.html
index e79da5a8b0..b68a4c5939 100644
--- a/public/vendor/plugins/codemirror/mode/dart/index.html
+++ b/public/vendor/plugins/codemirror/mode/dart/index.html
@@ -9,7 +9,7 @@
- Home
@@ -53,7 +54,7 @@ window.onload = function() {
indentWithTabs: true,
smartIndent: true,
lineNumbers: true,
- matchBrackets : true,
+ matchBrackets: true,
autofocus: true,
theme: 'neo'
});
diff --git a/public/vendor/plugins/codemirror/mode/cypher/test.js b/public/vendor/plugins/codemirror/mode/cypher/test.js
new file mode 100644
index 0000000000..691835596f
--- /dev/null
+++ b/public/vendor/plugins/codemirror/mode/cypher/test.js
@@ -0,0 +1,37 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function() {
+ var mode = CodeMirror.getMode({tabSize: 4, indentUnit: 2}, "cypher");
+ function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+ MT("unbalancedDoubledQuotedString",
+ "[string \"a'b\"][variable c]");
+
+ MT("unbalancedSingleQuotedString",
+ "[string 'a\"b'][variable c]");
+
+ MT("doubleQuotedString",
+ "[string \"a\"][variable b]");
+
+ MT("singleQuotedString",
+ "[string 'a'][variable b]");
+
+ MT("single attribute (with content)",
+ "[node {][atom a:][string 'a'][node }]");
+
+ MT("multiple attribute, singleQuotedString (with content)",
+ "[node {][atom a:][string 'a'][node ,][atom b:][string 'b'][node }]");
+
+ MT("multiple attribute, doubleQuotedString (with content)",
+ "[node {][atom a:][string \"a\"][node ,][atom b:][string \"b\"][node }]");
+
+ MT("single attribute (without content)",
+ "[node {][atom a:][string 'a'][node }]");
+
+ MT("multiple attribute, singleQuotedString (without content)",
+ "[node {][atom a:][string ''][node ,][atom b:][string ''][node }]");
+
+ MT("multiple attribute, doubleQuotedString (without content)",
+ "[node {][atom a:][string \"\"][node ,][atom b:][string \"\"][node }]");
+ })();
diff --git a/public/vendor/plugins/codemirror/mode/d/d.js b/public/vendor/plugins/codemirror/mode/d/d.js
index c927a7e358..efab570633 100644
--- a/public/vendor/plugins/codemirror/mode/d/d.js
+++ b/public/vendor/plugins/codemirror/mode/d/d.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -44,7 +44,7 @@ CodeMirror.defineMode("d", function(config, parserConfig) {
}
if (ch == "/") {
if (stream.eat("+")) {
- state.tokenize = tokenComment;
+ state.tokenize = tokenNestedComment;
return tokenNestedComment(stream, state);
}
if (stream.eat("*")) {
@@ -182,7 +182,12 @@ CodeMirror.defineMode("d", function(config, parserConfig) {
else return ctx.indented + (closing ? 0 : indentUnit);
},
- electricChars: "{}"
+ electricChars: "{}",
+ blockCommentStart: "/*",
+ blockCommentEnd: "*/",
+ blockCommentContinue: " * ",
+ lineComment: "//",
+ fold: "brace"
};
});
diff --git a/public/vendor/plugins/codemirror/mode/d/index.html b/public/vendor/plugins/codemirror/mode/d/index.html
index 08cabd8a2e..95437e5e7d 100644
--- a/public/vendor/plugins/codemirror/mode/d/index.html
+++ b/public/vendor/plugins/codemirror/mode/d/index.html
@@ -10,7 +10,7 @@
- Home
diff --git a/public/vendor/plugins/codemirror/mode/css/scss_test.js b/public/vendor/plugins/codemirror/mode/css/scss_test.js
index 785921b39c..68afc664b6 100644
--- a/public/vendor/plugins/codemirror/mode/css/scss_test.js
+++ b/public/vendor/plugins/codemirror/mode/css/scss_test.js
@@ -1,24 +1,24 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function() {
var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-scss");
function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), "scss"); }
MT('url_with_quotation',
- "[tag foo] { [property background]:[atom url]([string test.jpg]) }");
+ "[tag foo] { [property background]:[variable&callee url]([string test.jpg]) }");
MT('url_with_double_quotes',
- "[tag foo] { [property background]:[atom url]([string \"test.jpg\"]) }");
+ "[tag foo] { [property background]:[variable&callee url]([string \"test.jpg\"]) }");
MT('url_with_single_quotes',
- "[tag foo] { [property background]:[atom url]([string \'test.jpg\']) }");
+ "[tag foo] { [property background]:[variable&callee url]([string \'test.jpg\']) }");
MT('string',
"[def @import] [string \"compass/css3\"]");
MT('important_keyword',
- "[tag foo] { [property background]:[atom url]([string \'test.jpg\']) [keyword !important] }");
+ "[tag foo] { [property background]:[variable&callee url]([string \'test.jpg\']) [keyword !important] }");
MT('variable',
"[variable-2 $blue]:[atom #333]");
@@ -95,7 +95,7 @@
MT('indent_parentheses',
"[tag foo] {",
- " [property color]: [atom darken]([variable-2 $blue],",
+ " [property color]: [variable&callee darken]([variable-2 $blue],",
" [number 9%]);",
"}");
diff --git a/public/vendor/plugins/codemirror/mode/css/test.js b/public/vendor/plugins/codemirror/mode/css/test.js
index 7a496fb091..64352d74fc 100644
--- a/public/vendor/plugins/codemirror/mode/css/test.js
+++ b/public/vendor/plugins/codemirror/mode/css/test.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function() {
var mode = CodeMirror.getMode({indentUnit: 2}, "css");
@@ -24,6 +24,9 @@
MT("atMediaUnknownFeatureValueKeyword",
"[def @media] ([property orientation]: [error upsidedown]) { }");
+ MT("atMediaUppercase",
+ "[def @MEDIA] ([property orienTAtion]: [keyword landScape]) { }");
+
MT("tagSelector",
"[tag foo] { }");
@@ -86,11 +89,11 @@
"[tag foo] { [property margin]: [number 0]; [property padding]: [number 0]; }");
MT("tagTwoPropertiesURL",
- "[tag foo] { [property background]: [atom url]([string //example.com/foo.png]); [property padding]: [number 0]; }");
+ "[tag foo] { [property background]: [variable&callee url]([string //example.com/foo.png]); [property padding]: [number 0]; }");
MT("indent_tagSelector",
"[tag strong], [tag em] {",
- " [property background]: [atom rgba](",
+ " [property background]: [variable&callee rgba](",
" [number 255], [number 255], [number 0], [number .2]",
" );",
"}");
@@ -111,7 +114,7 @@
MT("indent_parentheses",
"[tag foo]:[variable-3 before] {",
- " [property background]: [atom url](",
+ " [property background]: [variable&callee url](",
"[string blahblah]",
"[string etc]",
"[string ]) [keyword !important];",
@@ -121,20 +124,20 @@
"[def @font-face] {",
" [property font-family]: [string 'myfont'];",
" [error nonsense]: [string 'abc'];",
- " [property src]: [atom url]([string http://blah]),",
- " [atom url]([string http://foo]);",
+ " [property src]: [variable&callee url]([string http://blah]),",
+ " [variable&callee url]([string http://foo]);",
"}");
MT("empty_url",
- "[def @import] [atom url]() [attribute screen];");
+ "[def @import] [variable&callee url]() [attribute screen];");
MT("parens",
"[qualifier .foo] {",
- " [property background-image]: [variable fade]([atom #000], [number 20%]);",
- " [property border-image]: [atom linear-gradient](",
+ " [property background-image]: [variable&callee fade]([atom #000], [number 20%]);",
+ " [property border-image]: [variable&callee linear-gradient](",
" [atom to] [atom bottom],",
- " [variable fade]([atom #000], [number 20%]) [number 0%],",
- " [variable fade]([atom #000], [number 20%]) [number 100%]",
+ " [variable&callee fade]([atom #000], [number 20%]) [number 0%],",
+ " [variable&callee fade]([atom #000], [number 20%]) [number 100%]",
" );",
"}");
@@ -143,7 +146,15 @@
" [variable-2 --main-color]: [atom #06c];",
"}",
"[tag h1][builtin #foo] {",
- " [property color]: [atom var]([variable-2 --main-color]);",
+ " [property color]: [variable&callee var]([variable-2 --main-color]);",
+ "}");
+
+ MT("blank_css_variable",
+ ":[variable-3 root] {",
+ " [variable-2 --]: [atom #06c];",
+ "}",
+ "[tag h1][builtin #foo] {",
+ " [property color]: [variable&callee var]([variable-2 --]);",
"}");
MT("supports",
@@ -152,10 +163,10 @@
"}");
MT("document",
- "[def @document] [tag url]([string http://blah]),",
- " [tag url-prefix]([string https://]),",
- " [tag domain]([string blah.com]),",
- " [tag regexp]([string \".*blah.+\"]) {",
+ "[def @document] [variable&callee url]([string http://blah]),",
+ " [variable&callee url-prefix]([string https://]),",
+ " [variable&callee domain]([string blah.com]),",
+ " [variable&callee regexp]([string \".*blah.+\"]) {",
" [builtin #id] {",
" [property background-color]: [keyword white];",
" }",
@@ -165,16 +176,16 @@
"}");
MT("document_url",
- "[def @document] [tag url]([string http://blah]) { [qualifier .class] { } }");
+ "[def @document] [variable&callee url]([string http://blah]) { [qualifier .class] { } }");
MT("document_urlPrefix",
- "[def @document] [tag url-prefix]([string https://]) { [builtin #id] { } }");
+ "[def @document] [variable&callee url-prefix]([string https://]) { [builtin #id] { } }");
MT("document_domain",
- "[def @document] [tag domain]([string blah.com]) { [tag foo] { } }");
+ "[def @document] [variable&callee domain]([string blah.com]) { [tag foo] { } }");
MT("document_regexp",
- "[def @document] [tag regexp]([string \".*blah.+\"]) { [builtin #id] { } }");
+ "[def @document] [variable&callee regexp]([string \".*blah.+\"]) { [builtin #id] { } }");
MT("counter-style",
"[def @counter-style] [variable binary] {",
@@ -196,5 +207,11 @@
"[tag ol][qualifier .roman] { [property list-style]: [variable simple-roman]; }");
MT("counter-style-symbols",
- "[tag ol] { [property list-style]: [atom symbols]([atom cyclic] [string \"*\"] [string \"\\2020\"] [string \"\\2021\"] [string \"\\A7\"]); }");
+ "[tag ol] { [property list-style]: [variable&callee symbols]([atom cyclic] [string \"*\"] [string \"\\2020\"] [string \"\\2021\"] [string \"\\A7\"]); }");
+
+ MT("comment-does-not-disrupt",
+ "[def @font-face] [comment /* foo */] {",
+ " [property src]: [variable&callee url]([string x]);",
+ " [property font-family]: [variable One];",
+ "}")
})();
diff --git a/public/vendor/plugins/codemirror/mode/cypher/cypher.js b/public/vendor/plugins/codemirror/mode/cypher/cypher.js
index 107e4f6d21..8b22e65db8 100644
--- a/public/vendor/plugins/codemirror/mode/cypher/cypher.js
+++ b/public/vendor/plugins/codemirror/mode/cypher/cypher.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
// By the Neo4j Team and contributors.
// https://github.com/neo4j-contrib/CodeMirror
@@ -20,8 +20,12 @@
CodeMirror.defineMode("cypher", function(config) {
var tokenBase = function(stream/*, state*/) {
var ch = stream.next();
- if (ch === "\"" || ch === "'") {
- stream.match(/.+?["']/);
+ if (ch ==='"') {
+ stream.match(/.*?"/);
+ return "string";
+ }
+ if (ch === "'") {
+ stream.match(/.*?'/);
return "string";
}
if (/[{}\(\),\.;\[\]]/.test(ch)) {
@@ -62,7 +66,7 @@
var curPunc;
var funcs = wordRegexp(["abs", "acos", "allShortestPaths", "asin", "atan", "atan2", "avg", "ceil", "coalesce", "collect", "cos", "cot", "count", "degrees", "e", "endnode", "exp", "extract", "filter", "floor", "haversin", "head", "id", "keys", "labels", "last", "left", "length", "log", "log10", "lower", "ltrim", "max", "min", "node", "nodes", "percentileCont", "percentileDisc", "pi", "radians", "rand", "range", "reduce", "rel", "relationship", "relationships", "replace", "reverse", "right", "round", "rtrim", "shortestPath", "sign", "sin", "size", "split", "sqrt", "startnode", "stdev", "stdevp", "str", "substring", "sum", "tail", "tan", "timestamp", "toFloat", "toInt", "toString", "trim", "type", "upper"]);
var preds = wordRegexp(["all", "and", "any", "contains", "exists", "has", "in", "none", "not", "or", "single", "xor"]);
- var keywords = wordRegexp(["as", "asc", "ascending", "assert", "by", "case", "commit", "constraint", "create", "csv", "cypher", "delete", "desc", "descending", "detach", "distinct", "drop", "else", "end", "ends", "explain", "false", "fieldterminator", "foreach", "from", "headers", "in", "index", "is", "join", "limit", "load", "match", "merge", "null", "on", "optional", "order", "periodic", "profile", "remove", "return", "scan", "set", "skip", "start", "starts", "then", "true", "union", "unique", "unwind", "using", "when", "where", "with"]);
+ var keywords = wordRegexp(["as", "asc", "ascending", "assert", "by", "case", "commit", "constraint", "create", "csv", "cypher", "delete", "desc", "descending", "detach", "distinct", "drop", "else", "end", "ends", "explain", "false", "fieldterminator", "foreach", "from", "headers", "in", "index", "is", "join", "limit", "load", "match", "merge", "null", "on", "optional", "order", "periodic", "profile", "remove", "return", "scan", "set", "skip", "start", "starts", "then", "true", "union", "unique", "unwind", "using", "when", "where", "with", "call", "yield"]);
var operatorChars = /[*+\-<>=&|~%^]/;
return {
diff --git a/public/vendor/plugins/codemirror/mode/cypher/index.html b/public/vendor/plugins/codemirror/mode/cypher/index.html
index b8bd75c8b3..0db7a6a7c6 100644
--- a/public/vendor/plugins/codemirror/mode/cypher/index.html
+++ b/public/vendor/plugins/codemirror/mode/cypher/index.html
@@ -7,6 +7,7 @@
+
- Home
@@ -140,8 +140,8 @@ fieldset span button, fieldset span input[type="file"] {
diff --git a/public/vendor/plugins/codemirror/mode/css/less_test.js b/public/vendor/plugins/codemirror/mode/css/less_test.js
index dd821558b0..abeb6a2040 100644
--- a/public/vendor/plugins/codemirror/mode/css/less_test.js
+++ b/public/vendor/plugins/codemirror/mode/css/less_test.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function() {
"use strict";
@@ -10,8 +10,8 @@
MT("variable",
"[variable-2 @base]: [atom #f04615];",
"[qualifier .class] {",
- " [property width]: [variable percentage]([number 0.5]); [comment // returns `50%`]",
- " [property color]: [variable saturate]([variable-2 @base], [number 5%]);",
+ " [property width]: [variable&callee percentage]([number 0.5]); [comment // returns `50%`]",
+ " [property color]: [variable&callee saturate]([variable-2 @base], [number 5%]);",
"}");
MT("amp",
@@ -26,10 +26,10 @@
MT("mixin",
"[qualifier .mixin] ([variable dark]; [variable-2 @color]) {",
- " [property color]: [atom darken]([variable-2 @color], [number 10%]);",
+ " [property color]: [variable&callee darken]([variable-2 @color], [number 10%]);",
"}",
"[qualifier .mixin] ([variable light]; [variable-2 @color]) {",
- " [property color]: [atom lighten]([variable-2 @color], [number 10%]);",
+ " [property color]: [variable&callee lighten]([variable-2 @color], [number 10%]);",
"}",
"[qualifier .mixin] ([variable-2 @_]; [variable-2 @color]) {",
" [property display]: [atom block];",
diff --git a/public/vendor/plugins/codemirror/mode/css/scss.html b/public/vendor/plugins/codemirror/mode/css/scss.html
index f8e4d37368..3e42ea6535 100644
--- a/public/vendor/plugins/codemirror/mode/css/scss.html
+++ b/public/vendor/plugins/codemirror/mode/css/scss.html
@@ -6,10 +6,11 @@
+
- Home
@@ -64,7 +64,7 @@ code {
diff --git a/public/vendor/plugins/codemirror/mode/css/less.html b/public/vendor/plugins/codemirror/mode/css/less.html
index adf7427d30..6ceb7a0342 100644
--- a/public/vendor/plugins/codemirror/mode/css/less.html
+++ b/public/vendor/plugins/codemirror/mode/css/less.html
@@ -10,7 +10,7 @@
- Home
@@ -90,7 +91,7 @@ body {
var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
extraKeys: {"Ctrl-Space": "autocomplete"},
lineNumbers: true,
- matchBrackets: "text/x-less",
+ matchBrackets: true,
mode: "text/x-gss"
});
diff --git a/public/vendor/plugins/codemirror/mode/css/gss_test.js b/public/vendor/plugins/codemirror/mode/css/gss_test.js
index d56e592803..2401bc4968 100644
--- a/public/vendor/plugins/codemirror/mode/css/gss_test.js
+++ b/public/vendor/plugins/codemirror/mode/css/gss_test.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function() {
"use strict";
diff --git a/public/vendor/plugins/codemirror/mode/css/index.html b/public/vendor/plugins/codemirror/mode/css/index.html
index 2d2b9b073c..b39f126597 100644
--- a/public/vendor/plugins/codemirror/mode/css/index.html
+++ b/public/vendor/plugins/codemirror/mode/css/index.html
@@ -12,7 +12,7 @@
- Home
@@ -48,8 +48,6 @@ puts "Listening on http://0.0.0.0:8080"
server.listen
module Foo
- def initialize(@foo); end
-
abstract def abstract_method : String
@[AlwaysInline]
@@ -58,7 +56,8 @@ module Foo
end
struct Foo
- def initialize(@foo); end
+ def initialize(@foo : ::Foo)
+ end
def hello_world
@foo.abstract_method
@@ -71,8 +70,7 @@ class Bar
@@foobar = 12345
- def initialize(@bar)
- super(@bar.not_nil! + 100)
+ def initialize(@bar : Int32)
end
macro alias_method(name, method)
@@ -87,11 +85,10 @@ class Bar
alias_method abstract_method, a_method
- macro def show_instance_vars : Nil
+ def show_instance_vars : Nil
{% for var in @type.instance_vars %}
puts "@{{ var }} = #{ @{{ var }} }"
{% end %}
- nil
end
end
@@ -101,9 +98,9 @@ lib LibC
fun c_puts = "puts"(str : Char*) : Int
end
-$baz = Baz.new(100)
-$baz.show_instance_vars
-$baz.with_foofoo do
+baz = Baz.new(100)
+baz.show_instance_vars
+baz.with_foofoo do
LibC.c_puts hello_world
end
diff --git a/public/vendor/plugins/codemirror/mode/css/css.js b/public/vendor/plugins/codemirror/mode/css/css.js
index ea7bd01d84..05742c5c45 100644
--- a/public/vendor/plugins/codemirror/mode/css/css.js
+++ b/public/vendor/plugins/codemirror/mode/css/css.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -28,6 +28,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
colorKeywords = parserConfig.colorKeywords || {},
valueKeywords = parserConfig.valueKeywords || {},
allowNested = parserConfig.allowNested,
+ lineComment = parserConfig.lineComment,
supportsAtComponent = parserConfig.supportsAtComponent === true;
var type, override;
@@ -62,7 +63,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
if (/[\d.]/.test(stream.peek())) {
stream.eatWhile(/[\w.%]/);
return ret("number", "unit");
- } else if (stream.match(/^-[\w\\\-]+/)) {
+ } else if (stream.match(/^-[\w\\\-]*/)) {
stream.eatWhile(/[\w\\\-]/);
if (stream.match(/^\s*:/, false))
return ret("variable-2", "variable-definition");
@@ -76,12 +77,11 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
return ret("qualifier", "qualifier");
} else if (/[:;{}\[\]\(\)]/.test(ch)) {
return ret(null, ch);
- } else if ((ch == "u" && stream.match(/rl(-prefix)?\(/)) ||
- (ch == "d" && stream.match("omain(")) ||
- (ch == "r" && stream.match("egexp("))) {
- stream.backUp(1);
- state.tokenize = tokenParenthesized;
- return ret("property", "word");
+ } else if (stream.match(/[\w-.]+(?=\()/)) {
+ if (/^(url(-prefix)?|domain|regexp)$/.test(stream.current().toLowerCase())) {
+ state.tokenize = tokenParenthesized;
+ }
+ return ret("variable callee", "variable");
} else if (/[\w\\\-]/.test(ch)) {
stream.eatWhile(/[\w\\\-]/);
return ret("property", "word");
@@ -161,16 +161,16 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
return pushContext(state, stream, "block");
} else if (type == "}" && state.context.prev) {
return popContext(state);
- } else if (supportsAtComponent && /@component/.test(type)) {
+ } else if (supportsAtComponent && /@component/i.test(type)) {
return pushContext(state, stream, "atComponentBlock");
- } else if (/^@(-moz-)?document$/.test(type)) {
+ } else if (/^@(-moz-)?document$/i.test(type)) {
return pushContext(state, stream, "documentTypes");
- } else if (/^@(media|supports|(-moz-)?document|import)$/.test(type)) {
+ } else if (/^@(media|supports|(-moz-)?document|import)$/i.test(type)) {
return pushContext(state, stream, "atBlock");
- } else if (/^@(font-face|counter-style)/.test(type)) {
+ } else if (/^@(font-face|counter-style)/i.test(type)) {
state.stateArg = type;
return "restricted_atBlock_before";
- } else if (/^@(-(moz|ms|o|webkit)-)?keyframes$/.test(type)) {
+ } else if (/^@(-(moz|ms|o|webkit)-)?keyframes$/i.test(type)) {
return "keyframes";
} else if (type && type.charAt(0) == "@") {
return pushContext(state, stream, "at");
@@ -253,6 +253,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
};
states.pseudo = function(type, stream, state) {
+ if (type == "meta") return "pseudo";
+
if (type == "word") {
override = "variable-3";
return state.context.type;
@@ -380,7 +382,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
style = style[0];
}
override = style;
- state.state = states[state.state](type, stream, state);
+ if (type != "comment")
+ state.state = states[state.state](type, stream, state);
return override;
},
@@ -398,7 +401,6 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
ch == "{" && (cx.type == "at" || cx.type == "atBlock")) {
// Dedent relative to current context.
indent = Math.max(0, cx.indent - indentUnit);
- cx = cx.prev;
}
}
return indent;
@@ -407,6 +409,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
electricChars: "}",
blockCommentStart: "/*",
blockCommentEnd: "*/",
+ blockCommentContinue: " * ",
+ lineComment: lineComment,
fold: "brace"
};
});
@@ -414,7 +418,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
function keySet(array) {
var keys = {};
for (var i = 0; i < array.length; ++i) {
- keys[array[i]] = true;
+ keys[array[i].toLowerCase()] = true;
}
return keys;
}
@@ -468,7 +472,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
"border-top-left-radius", "border-top-right-radius", "border-top-style",
"border-top-width", "border-width", "bottom", "box-decoration-break",
"box-shadow", "box-sizing", "break-after", "break-before", "break-inside",
- "caption-side", "clear", "clip", "color", "color-profile", "column-count",
+ "caption-side", "caret-color", "clear", "clip", "color", "color-profile", "column-count",
"column-fill", "column-gap", "column-rule", "column-rule-color",
"column-rule-style", "column-rule-width", "column-span", "column-width",
"columns", "content", "counter-increment", "counter-reset", "crop", "cue",
@@ -489,14 +493,14 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
"grid-row-start", "grid-template", "grid-template-areas", "grid-template-columns",
"grid-template-rows", "hanging-punctuation", "height", "hyphens",
"icon", "image-orientation", "image-rendering", "image-resolution",
- "inline-box-align", "justify-content", "left", "letter-spacing",
+ "inline-box-align", "justify-content", "justify-items", "justify-self", "left", "letter-spacing",
"line-break", "line-height", "line-stacking", "line-stacking-ruby",
"line-stacking-shift", "line-stacking-strategy", "list-style",
"list-style-image", "list-style-position", "list-style-type", "margin",
"margin-bottom", "margin-left", "margin-right", "margin-top",
- "marker-offset", "marks", "marquee-direction", "marquee-loop",
+ "marks", "marquee-direction", "marquee-loop",
"marquee-play-count", "marquee-speed", "marquee-style", "max-height",
- "max-width", "min-height", "min-width", "move-to", "nav-down", "nav-index",
+ "max-width", "min-height", "min-width", "mix-blend-mode", "move-to", "nav-down", "nav-index",
"nav-left", "nav-right", "nav-up", "object-fit", "object-position",
"opacity", "order", "orphans", "outline",
"outline-color", "outline-offset", "outline-style", "outline-width",
@@ -504,7 +508,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
"padding", "padding-bottom", "padding-left", "padding-right", "padding-top",
"page", "page-break-after", "page-break-before", "page-break-inside",
"page-policy", "pause", "pause-after", "pause-before", "perspective",
- "perspective-origin", "pitch", "pitch-range", "play-during", "position",
+ "perspective-origin", "pitch", "pitch-range", "place-content", "place-items", "place-self", "play-during", "position",
"presentation-level", "punctuation-trim", "quotes", "region-break-after",
"region-break-before", "region-break-inside", "region-fragment",
"rendering-intent", "resize", "rest", "rest-after", "rest-before", "richness",
@@ -522,9 +526,9 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
"text-wrap", "top", "transform", "transform-origin", "transform-style",
"transition", "transition-delay", "transition-duration",
"transition-property", "transition-timing-function", "unicode-bidi",
- "vertical-align", "visibility", "voice-balance", "voice-duration",
+ "user-select", "vertical-align", "visibility", "voice-balance", "voice-duration",
"voice-family", "voice-pitch", "voice-range", "voice-rate", "voice-stress",
- "voice-volume", "volume", "white-space", "widows", "width", "word-break",
+ "voice-volume", "volume", "white-space", "widows", "width", "will-change", "word-break",
"word-spacing", "word-wrap", "z-index",
// SVG-specific
"clip-path", "clip-rule", "mask", "enable-background", "filter", "flood-color",
@@ -589,7 +593,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
"above", "absolute", "activeborder", "additive", "activecaption", "afar",
"after-white-space", "ahead", "alias", "all", "all-scroll", "alphabetic", "alternate",
"always", "amharic", "amharic-abegede", "antialiased", "appworkspace",
- "arabic-indic", "armenian", "asterisks", "attr", "auto", "avoid", "avoid-column", "avoid-page",
+ "arabic-indic", "armenian", "asterisks", "attr", "auto", "auto-flow", "avoid", "avoid-column", "avoid-page",
"avoid-region", "background", "backwards", "baseline", "below", "bidi-override", "binary",
"bengali", "blink", "block", "block-axis", "bold", "bolder", "border", "border-box",
"both", "bottom", "break", "break-all", "break-word", "bullets", "button", "button-bevel",
@@ -598,7 +602,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
"cell", "center", "checkbox", "circle", "cjk-decimal", "cjk-earthly-branch",
"cjk-heavenly-stem", "cjk-ideographic", "clear", "clip", "close-quote",
"col-resize", "collapse", "color", "color-burn", "color-dodge", "column", "column-reverse",
- "compact", "condensed", "contain", "content",
+ "compact", "condensed", "contain", "content", "contents",
"content-box", "context-menu", "continuous", "copy", "counter", "counters", "cover", "crop",
"cross", "crosshair", "currentcolor", "cursive", "cyclic", "darken", "dashed", "decimal",
"decimal-leading-zero", "default", "default-button", "dense", "destination-atop",
@@ -641,7 +645,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
"mix", "mongolian", "monospace", "move", "multiple", "multiply", "myanmar", "n-resize",
"narrower", "ne-resize", "nesw-resize", "no-close-quote", "no-drop",
"no-open-quote", "no-repeat", "none", "normal", "not-allowed", "nowrap",
- "ns-resize", "numbers", "numeric", "nw-resize", "nwse-resize", "oblique", "octal", "open-quote",
+ "ns-resize", "numbers", "numeric", "nw-resize", "nwse-resize", "oblique", "octal", "opacity", "open-quote",
"optimizeLegibility", "optimizeSpeed", "oriya", "oromo", "outset",
"outside", "outside-shape", "overlay", "overline", "padding", "padding-box",
"painted", "page", "paused", "persian", "perspective", "plus-darker", "plus-lighter",
@@ -653,17 +657,17 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
"rgb", "rgba", "ridge", "right", "rotate", "rotate3d", "rotateX", "rotateY",
"rotateZ", "round", "row", "row-resize", "row-reverse", "rtl", "run-in", "running",
"s-resize", "sans-serif", "saturation", "scale", "scale3d", "scaleX", "scaleY", "scaleZ", "screen",
- "scroll", "scrollbar", "se-resize", "searchfield",
+ "scroll", "scrollbar", "scroll-position", "se-resize", "searchfield",
"searchfield-cancel-button", "searchfield-decoration",
- "searchfield-results-button", "searchfield-results-decoration",
+ "searchfield-results-button", "searchfield-results-decoration", "self-start", "self-end",
"semi-condensed", "semi-expanded", "separate", "serif", "show", "sidama",
"simp-chinese-formal", "simp-chinese-informal", "single",
"skew", "skewX", "skewY", "skip-white-space", "slide", "slider-horizontal",
"slider-vertical", "sliderthumb-horizontal", "sliderthumb-vertical", "slow",
"small", "small-caps", "small-caption", "smaller", "soft-light", "solid", "somali",
- "source-atop", "source-in", "source-out", "source-over", "space", "space-around", "space-between", "spell-out", "square",
+ "source-atop", "source-in", "source-out", "source-over", "space", "space-around", "space-between", "space-evenly", "spell-out", "square",
"square-button", "start", "static", "status-bar", "stretch", "stroke", "sub",
- "subpixel-antialiased", "super", "sw-resize", "symbolic", "symbols", "table",
+ "subpixel-antialiased", "super", "sw-resize", "symbolic", "symbols", "system-ui", "table",
"table-caption", "table-cell", "table-column", "table-column-group",
"table-footer-group", "table-header-group", "table-row", "table-row-group",
"tamil",
@@ -671,9 +675,9 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
"thick", "thin", "threeddarkshadow", "threedface", "threedhighlight",
"threedlightshadow", "threedshadow", "tibetan", "tigre", "tigrinya-er",
"tigrinya-er-abegede", "tigrinya-et", "tigrinya-et-abegede", "to", "top",
- "trad-chinese-formal", "trad-chinese-informal",
+ "trad-chinese-formal", "trad-chinese-informal", "transform",
"translate", "translate3d", "translateX", "translateY", "translateZ",
- "transparent", "ultra-condensed", "ultra-expanded", "underline", "up",
+ "transparent", "ultra-condensed", "ultra-expanded", "underline", "unset", "up",
"upper-alpha", "upper-armenian", "upper-greek", "upper-hexadecimal",
"upper-latin", "upper-norwegian", "upper-roman", "uppercase", "urdu", "url",
"var", "vertical", "vertical-text", "visible", "visibleFill", "visiblePainted",
@@ -730,6 +734,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
valueKeywords: valueKeywords,
fontProperties: fontProperties,
allowNested: true,
+ lineComment: "//",
tokenHooks: {
"/": function(stream, state) {
if (stream.eat("/")) {
@@ -743,8 +748,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
}
},
":": function(stream) {
- if (stream.match(/\s*\{/))
- return [null, "{"];
+ if (stream.match(/\s*\{/, false))
+ return [null, null]
return false;
},
"$": function(stream) {
@@ -772,6 +777,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
valueKeywords: valueKeywords,
fontProperties: fontProperties,
allowNested: true,
+ lineComment: "//",
tokenHooks: {
"/": function(stream, state) {
if (stream.eat("/")) {
@@ -786,7 +792,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
},
"@": function(stream) {
if (stream.eat("{")) return [null, "interpolation"];
- if (stream.match(/^(charset|document|font-face|import|(-(moz|ms|o|webkit)-)?keyframes|media|namespace|page|supports)\b/, false)) return false;
+ if (stream.match(/^(charset|document|font-face|import|(-(moz|ms|o|webkit)-)?keyframes|media|namespace|page|supports)\b/i, false)) return false;
stream.eatWhile(/[\w\\\-]/);
if (stream.match(/^\s*:/, false))
return ["variable-2", "variable-definition"];
diff --git a/public/vendor/plugins/codemirror/mode/css/gss.html b/public/vendor/plugins/codemirror/mode/css/gss.html
index 232fe8c12b..447929bf21 100644
--- a/public/vendor/plugins/codemirror/mode/css/gss.html
+++ b/public/vendor/plugins/codemirror/mode/css/gss.html
@@ -8,11 +8,12 @@
+
- Home
diff --git a/public/vendor/plugins/codemirror/mode/crystal/crystal.js b/public/vendor/plugins/codemirror/mode/crystal/crystal.js
index e63627cee8..5c601c6ab3 100644
--- a/public/vendor/plugins/codemirror/mode/crystal/crystal.js
+++ b/public/vendor/plugins/codemirror/mode/crystal/crystal.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -29,26 +29,22 @@
var types = /^[A-Z_\u009F-\uFFFF][a-zA-Z0-9_\u009F-\uFFFF]*/;
var keywords = wordRegExp([
"abstract", "alias", "as", "asm", "begin", "break", "case", "class", "def", "do",
- "else", "elsif", "end", "ensure", "enum", "extend", "for", "fun", "if", "ifdef",
+ "else", "elsif", "end", "ensure", "enum", "extend", "for", "fun", "if",
"include", "instance_sizeof", "lib", "macro", "module", "next", "of", "out", "pointerof",
- "private", "protected", "rescue", "return", "require", "sizeof", "struct",
- "super", "then", "type", "typeof", "union", "unless", "until", "when", "while", "with",
- "yield", "__DIR__", "__FILE__", "__LINE__"
+ "private", "protected", "rescue", "return", "require", "select", "sizeof", "struct",
+ "super", "then", "type", "typeof", "uninitialized", "union", "unless", "until", "when", "while", "with",
+ "yield", "__DIR__", "__END_LINE__", "__FILE__", "__LINE__"
]);
var atomWords = wordRegExp(["true", "false", "nil", "self"]);
var indentKeywordsArray = [
"def", "fun", "macro",
"class", "module", "struct", "lib", "enum", "union",
- "if", "unless", "case", "while", "until", "begin", "then",
- "do",
- "for", "ifdef"
+ "do", "for"
];
var indentKeywords = wordRegExp(indentKeywordsArray);
- var dedentKeywordsArray = [
- "end",
- "else", "elsif",
- "rescue", "ensure"
- ];
+ var indentExpressionKeywordsArray = ["if", "unless", "case", "while", "until", "begin", "then"];
+ var indentExpressionKeywords = wordRegExp(indentExpressionKeywordsArray);
+ var dedentKeywordsArray = ["end", "else", "elsif", "rescue", "ensure"];
var dedentKeywords = wordRegExp(dedentKeywordsArray);
var dedentPunctualsArray = ["\\)", "\\}", "\\]"];
var dedentPunctuals = new RegExp("^(?:" + dedentPunctualsArray.join("|") + ")$");
@@ -90,12 +86,15 @@
} else if (state.lastToken == ".") {
return "property";
} else if (keywords.test(matched)) {
- if (state.lastToken != "abstract" && indentKeywords.test(matched)) {
- if (!(matched == "fun" && state.blocks.indexOf("lib") >= 0)) {
+ if (indentKeywords.test(matched)) {
+ if (!(matched == "fun" && state.blocks.indexOf("lib") >= 0) && !(matched == "def" && state.lastToken == "abstract")) {
state.blocks.push(matched);
state.currentIndent += 1;
}
- } else if (dedentKeywords.test(matched)) {
+ } else if ((state.lastStyle == "operator" || !state.lastStyle) && indentExpressionKeywords.test(matched)) {
+ state.blocks.push(matched);
+ state.currentIndent += 1;
+ } else if (matched == "end") {
state.blocks.pop();
state.currentIndent -= 1;
}
@@ -124,12 +123,6 @@
return "variable-2";
}
- // Global variables
- if (stream.eat("$")) {
- stream.eat(/[0-9]+|\?/) || stream.match(idents) || stream.match(types);
- return "variable-3";
- }
-
// Constants and types
if (stream.match(types)) {
return "tag";
@@ -165,6 +158,9 @@
} else if (stream.match("%w")) {
embed = false;
delim = stream.next();
+ } else if (stream.match("%q")) {
+ embed = false;
+ delim = stream.next();
} else {
if(delim = stream.match(/^%([^\w\s=])/)) {
delim = delim[1];
@@ -183,6 +179,11 @@
return chain(tokenQuote(delim, style, embed), stream, state);
}
+ // Here Docs
+ if (matched = stream.match(/^<<-('?)([A-Z]\w*)\1/)) {
+ return chain(tokenHereDoc(matched[2], !matched[1]), stream, state)
+ }
+
// Characters
if (stream.eat("'")) {
stream.match(/^(?:[^']|\\(?:[befnrtv0'"]|[0-7]{3}|u(?:[0-9a-fA-F]{4}|\{[0-9a-fA-F]{1,6}\})))/);
@@ -202,7 +203,7 @@
return "number";
}
- if (stream.eat(/\d/)) {
+ if (stream.eat(/^\d/)) {
stream.match(/^\d*(?:\.\d+)?(?:[eE][+-]?\d+)?/);
return "number";
}
@@ -339,7 +340,7 @@
return style;
}
- escaped = ch == "\\";
+ escaped = embed && ch == "\\";
} else {
stream.next();
escaped = false;
@@ -350,12 +351,52 @@
};
}
+ function tokenHereDoc(phrase, embed) {
+ return function (stream, state) {
+ if (stream.sol()) {
+ stream.eatSpace()
+ if (stream.match(phrase)) {
+ state.tokenize.pop();
+ return "string";
+ }
+ }
+
+ var escaped = false;
+ while (stream.peek()) {
+ if (!escaped) {
+ if (stream.match("{%", false)) {
+ state.tokenize.push(tokenMacro("%", "%"));
+ return "string";
+ }
+
+ if (stream.match("{{", false)) {
+ state.tokenize.push(tokenMacro("{", "}"));
+ return "string";
+ }
+
+ if (embed && stream.match("#{", false)) {
+ state.tokenize.push(tokenNest("#{", "}", "meta"));
+ return "string";
+ }
+
+ escaped = embed && stream.next() == "\\";
+ } else {
+ stream.next();
+ escaped = false;
+ }
+ }
+
+ return "string";
+ }
+ }
+
return {
startState: function () {
return {
tokenize: [tokenBase],
currentIndent: 0,
lastToken: null,
+ lastStyle: null,
blocks: []
};
},
@@ -366,6 +407,7 @@
if (style && style != "comment") {
state.lastToken = token;
+ state.lastStyle = style;
}
return style;
diff --git a/public/vendor/plugins/codemirror/mode/crystal/index.html b/public/vendor/plugins/codemirror/mode/crystal/index.html
index ec03e25094..ae4218eec5 100644
--- a/public/vendor/plugins/codemirror/mode/crystal/index.html
+++ b/public/vendor/plugins/codemirror/mode/crystal/index.html
@@ -14,7 +14,7 @@
- Home
@@ -733,7 +733,7 @@ wrapper::value = -> this._wrapped
var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
-
- Home
diff --git a/public/vendor/plugins/codemirror/mode/coffeescript/coffeescript.js b/public/vendor/plugins/codemirror/mode/coffeescript/coffeescript.js
index adf2184fd7..a54e9d5ed0 100644
--- a/public/vendor/plugins/codemirror/mode/coffeescript/coffeescript.js
+++ b/public/vendor/plugins/codemirror/mode/coffeescript/coffeescript.js
@@ -1,5 +1,5 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
/**
* Link to the project's GitHub page:
@@ -349,6 +349,10 @@ CodeMirror.defineMode("coffeescript", function(conf, parserConf) {
return external;
});
+// IANA registered media type
+// https://www.iana.org/assignments/media-types/
+CodeMirror.defineMIME("application/vnd.coffeescript", "coffeescript");
+
CodeMirror.defineMIME("text/x-coffeescript", "coffeescript");
CodeMirror.defineMIME("text/coffeescript", "coffeescript");
diff --git a/public/vendor/plugins/codemirror/mode/coffeescript/index.html b/public/vendor/plugins/codemirror/mode/coffeescript/index.html
index 93a5f4f309..650ccf5db8 100644
--- a/public/vendor/plugins/codemirror/mode/coffeescript/index.html
+++ b/public/vendor/plugins/codemirror/mode/coffeescript/index.html
@@ -9,7 +9,7 @@