The Unified and Autonomous Development Platform
fix: Heredoc syntax highlightting in bash fails (OD-2314)
Robin Shen936824a5becf
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/edit/matchbrackets.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/edit/matchbrackets.jsindex c342910ed5..0d1bcb662e 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/edit/matchbrackets.js+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/edit/matchbrackets.js@@ -27,7 +27,7 @@afterCursor = /(^| )cm-fat-cursor($| )/.test(cm.getWrapperElement().className)var re = bracketRegex(config)- // A cursor is defined as between two characters, but in in vim command mode+ // A cursor is defined as between two characters, but in vim command mode// (i.e. not insert mode), the cursor is visually represented as a// highlighted box on top of the 2nd character. Otherwise, we allow matches// from before or after the cursor.diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/lint/lint.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/lint/lint.jsindex 7b40e10e91..21631b9d24 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/lint/lint.js+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/lint/lint.js@@ -24,8 +24,10 @@function position(e) {if (!tt.parentNode) return CodeMirror.off(document, "mousemove", position);- tt.style.top = Math.max(0, e.clientY - tt.offsetHeight - 5) + "px";- tt.style.left = (e.clientX + 5) + "px";+ var top = Math.max(0, e.clientY - tt.offsetHeight - 5);+ var left = Math.max(0, Math.min(e.clientX + 5, tt.ownerDocument.defaultView.innerWidth - tt.offsetWidth));+ tt.style.top = top + "px"+ tt.style.left = left + "px";}CodeMirror.on(document, "mousemove", position);position(e);@@ -199,10 +201,6 @@var anns = annotations[line];if (!anns) continue;- // filter out duplicate messages- var message = [];- anns = anns.filter(function(item) { return message.indexOf(item.message) > -1 ? false : message.push(item.message) });-var maxSeverity = null;var tipLabel = state.hasGutter && document.createDocumentFragment();@@ -220,9 +218,8 @@__annotation: ann}));}- // use original annotations[line] to show multiple messagesif (state.hasGutter)- cm.setGutterMarker(line, GUTTER_ID, makeMarker(cm, tipLabel, maxSeverity, annotations[line].length > 1,+ cm.setGutterMarker(line, GUTTER_ID, makeMarker(cm, tipLabel, maxSeverity, anns.length > 1,options.tooltips));if (options.highlightLines)diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/lib/codemirror.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/lib/codemirror.jsindex b53a776aef..e42b63bb8d 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/lib/codemirror.js+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/lib/codemirror.js@@ -112,13 +112,14 @@} while (child = child.parentNode)}- function activeElt(doc) {+ function activeElt(rootNode) {// IE and Edge may throw an "Unspecified Error" when accessing document.activeElement.// IE < 10 will throw when accessed while the page is loading or in an iframe.// IE > 9 and Edge will throw when accessed in an iframe if document.body is unavailable.+ var doc = rootNode.ownerDocument || rootNode;var activeElement;try {- activeElement = doc.activeElement;+ activeElement = rootNode.activeElement;} catch(e) {activeElement = doc.body || null;}@@ -146,6 +147,15 @@function doc(cm) { return cm.display.wrapper.ownerDocument }+ function root(cm) {+ return rootNode(cm.display.wrapper)+ }++ function rootNode(element) {+ // Detect modern browsers (2017+).+ return element.getRootNode ? element.getRootNode() : element.ownerDocument+ }+function win(cm) { return doc(cm).defaultView }function bind(f) {@@ -3415,7 +3425,7 @@}// Compute the lines that are visible in a given viewport (defaults- // the the current scroll position). viewport may contain top,+ // the current scroll position). viewport may contain top,// height, and ensure (see op.scrollToPos) properties.function visibleLines(display, doc, viewport) {var top = viewport && viewport.top != null ? Math.max(0, viewport.top) : display.scroller.scrollTop;@@ -3900,7 +3910,7 @@cm.display.maxLineChanged = false;}- var takeFocus = op.focus && op.focus == activeElt(doc(cm));+ var takeFocus = op.focus && op.focus == activeElt(root(cm));if (op.preparedSelection){ cm.display.input.showSelection(op.preparedSelection, takeFocus); }if (op.updatedDisplay || op.startHeight != cm.doc.height)@@ -4077,7 +4087,7 @@function selectionSnapshot(cm) {if (cm.hasFocus()) { return null }- var active = activeElt(doc(cm));+ var active = activeElt(root(cm));if (!active || !contains(cm.display.lineDiv, active)) { return null }var result = {activeElt: active};if (window.getSelection) {@@ -4093,7 +4103,7 @@}function restoreSelection(snapshot) {- if (!snapshot || !snapshot.activeElt || snapshot.activeElt == activeElt(snapshot.activeElt.ownerDocument)) { return }+ if (!snapshot || !snapshot.activeElt || snapshot.activeElt == activeElt(rootNode(snapshot.activeElt))) { return }snapshot.activeElt.focus();if (!/^(INPUT|TEXTAREA)$/.test(snapshot.activeElt.nodeName) &&snapshot.anchorNode && contains(document.body, snapshot.anchorNode) && contains(document.body, snapshot.focusNode)) {@@ -7264,7 +7274,7 @@function onKeyDown(e) {var cm = this;if (e.target && e.target != cm.display.input.getField()) { return }- cm.curOp.focus = activeElt(doc(cm));+ cm.curOp.focus = activeElt(root(cm));if (signalDOMEvent(cm, e)) { return }// IE does strange things with escape.if (ie && ie_version < 11 && e.keyCode == 27) { e.returnValue = false; }@@ -7426,7 +7436,7 @@function leftButtonDown(cm, pos, repeat, event) {if (ie) { setTimeout(bind(ensureFocus, cm), 0); }- else { cm.curOp.focus = activeElt(doc(cm)); }+ else { cm.curOp.focus = activeElt(root(cm)); }var behavior = configureMouse(cm, repeat, event);@@ -7496,19 +7506,19 @@// Normal selection, as opposed to text dragging.function leftButtonSelect(cm, event, start, behavior) {if (ie) { delayBlurEvent(cm); }- var display = cm.display, doc$1 = cm.doc;+ var display = cm.display, doc = cm.doc;e_preventDefault(event);- var ourRange, ourIndex, startSel = doc$1.sel, ranges = startSel.ranges;+ var ourRange, ourIndex, startSel = doc.sel, ranges = startSel.ranges;if (behavior.addNew && !behavior.extend) {- ourIndex = doc$1.sel.contains(start);+ ourIndex = doc.sel.contains(start);if (ourIndex > -1){ ourRange = ranges[ourIndex]; }else{ ourRange = new Range(start, start); }} else {- ourRange = doc$1.sel.primary();- ourIndex = doc$1.sel.primIndex;+ ourRange = doc.sel.primary();+ ourIndex = doc.sel.primIndex;}if (behavior.unit == "rectangle") {@@ -7525,18 +7535,18 @@if (!behavior.addNew) {ourIndex = 0;- setSelection(doc$1, new Selection([ourRange], 0), sel_mouse);- startSel = doc$1.sel;+ setSelection(doc, new Selection([ourRange], 0), sel_mouse);+ startSel = doc.sel;} else if (ourIndex == -1) {ourIndex = ranges.length;- setSelection(doc$1, normalizeSelection(cm, ranges.concat([ourRange]), ourIndex),+ setSelection(doc, normalizeSelection(cm, ranges.concat([ourRange]), ourIndex),{scroll: false, origin: "*mouse"});} else if (ranges.length > 1 && ranges[ourIndex].empty() && behavior.unit == "char" && !behavior.extend) {- setSelection(doc$1, normalizeSelection(cm, ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0),+ setSelection(doc, normalizeSelection(cm, ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0),{scroll: false, origin: "*mouse"});- startSel = doc$1.sel;+ startSel = doc.sel;} else {- replaceOneSelection(doc$1, ourIndex, ourRange, sel_mouse);+ replaceOneSelection(doc, ourIndex, ourRange, sel_mouse);}var lastPos = start;@@ -7546,19 +7556,19 @@if (behavior.unit == "rectangle") {var ranges = [], tabSize = cm.options.tabSize;- var startCol = countColumn(getLine(doc$1, start.line).text, start.ch, tabSize);- var posCol = countColumn(getLine(doc$1, pos.line).text, pos.ch, tabSize);+ var startCol = countColumn(getLine(doc, start.line).text, start.ch, tabSize);+ var posCol = countColumn(getLine(doc, pos.line).text, pos.ch, tabSize);var left = Math.min(startCol, posCol), right = Math.max(startCol, posCol);for (var line = Math.min(start.line, pos.line), end = Math.min(cm.lastLine(), Math.max(start.line, pos.line));line <= end; line++) {- var text = getLine(doc$1, line).text, leftPos = findColumn(text, left, tabSize);+ var text = getLine(doc, line).text, leftPos = findColumn(text, left, tabSize);if (left == right){ ranges.push(new Range(Pos(line, leftPos), Pos(line, leftPos))); }else if (text.length > leftPos){ ranges.push(new Range(Pos(line, leftPos), Pos(line, findColumn(text, right, tabSize)))); }}if (!ranges.length) { ranges.push(new Range(start, start)); }- setSelection(doc$1, normalizeSelection(cm, startSel.ranges.slice(0, ourIndex).concat(ranges), ourIndex),+ setSelection(doc, normalizeSelection(cm, startSel.ranges.slice(0, ourIndex).concat(ranges), ourIndex),{origin: "*mouse", scroll: false});cm.scrollIntoView(pos);} else {@@ -7573,8 +7583,8 @@anchor = maxPos(oldRange.to(), range.head);}var ranges$1 = startSel.ranges.slice(0);- ranges$1[ourIndex] = bidiSimplify(cm, new Range(clipPos(doc$1, anchor), head));- setSelection(doc$1, normalizeSelection(cm, ranges$1, ourIndex), sel_mouse);+ ranges$1[ourIndex] = bidiSimplify(cm, new Range(clipPos(doc, anchor), head));+ setSelection(doc, normalizeSelection(cm, ranges$1, ourIndex), sel_mouse);}}@@ -7590,9 +7600,9 @@var cur = posFromMouse(cm, e, true, behavior.unit == "rectangle");if (!cur) { return }if (cmp(cur, lastPos) != 0) {- cm.curOp.focus = activeElt(doc(cm));+ cm.curOp.focus = activeElt(root(cm));extendTo(cur);- var visible = visibleLines(display, doc$1);+ var visible = visibleLines(display, doc);if (cur.line >= visible.to || cur.line < visible.from){ setTimeout(operation(cm, function () {if (counter == curCount) { extend(e); }}), 150); }} else {@@ -7617,7 +7627,7 @@}off(display.wrapper.ownerDocument, "mousemove", move);off(display.wrapper.ownerDocument, "mouseup", up);- doc$1.history.lastSelOrigin = null;+ doc.history.lastSelOrigin = null;}var move = operation(cm, function (e) {@@ -8617,7 +8627,7 @@signal(this, "overwriteToggle", this, this.state.overwrite);},- hasFocus: function() { return this.display.input.getField() == activeElt(doc(this)) },+ hasFocus: function() { return this.display.input.getField() == activeElt(root(this)) },isReadOnly: function() { return !!(this.options.readOnly || this.doc.cantEdit) },scrollTo: methodOp(function (x, y) { scrollToCoords(this, x, y); }),@@ -8899,7 +8909,7 @@disableBrowserMagic(te);cm.display.lineSpace.insertBefore(kludge, cm.display.lineSpace.firstChild);te.value = lastCopied.text.join("\n");- var hadFocus = activeElt(div.ownerDocument);+ var hadFocus = activeElt(rootNode(div));selectInput(te);setTimeout(function () {cm.display.lineSpace.removeChild(kludge);@@ -8922,7 +8932,7 @@ContentEditableInput.prototype.prepareSelection = function () {var result = prepareSelection(this.cm, false);- result.focus = activeElt(this.div.ownerDocument) == this.div;+ result.focus = activeElt(rootNode(this.div)) == this.div;return result};@@ -9018,7 +9028,7 @@ContentEditableInput.prototype.focus = function () {if (this.cm.options.readOnly != "nocursor") {- if (!this.selectionInEditor() || activeElt(this.div.ownerDocument) != this.div)+ if (!this.selectionInEditor() || activeElt(rootNode(this.div)) != this.div){ this.showSelection(this.prepareSelection(), true); }this.div.focus();}@@ -9526,7 +9536,7 @@TextareaInput.prototype.supportsTouch = function () { return false };TextareaInput.prototype.focus = function () {- if (this.cm.options.readOnly != "nocursor" && (!mobile || activeElt(this.textarea.ownerDocument) != this.textarea)) {+ if (this.cm.options.readOnly != "nocursor" && (!mobile || activeElt(rootNode(this.textarea)) != this.textarea)) {try { this.textarea.focus(); }catch (e) {} // IE8 will throw if the textarea is display: none or not in DOM}@@ -9733,7 +9743,7 @@// Set autofocus to true if this textarea is focused, or if it has// autofocus and no other element is focused.if (options.autofocus == null) {- var hasFocus = activeElt(textarea.ownerDocument);+ var hasFocus = activeElt(rootNode(textarea));options.autofocus = hasFocus == textarea ||textarea.getAttribute("autofocus") != null && hasFocus == document.body;}@@ -9867,7 +9877,7 @@addLegacyProps(CodeMirror);- CodeMirror.version = "5.65.12";+ CodeMirror.version = "5.65.18";return CodeMirror;diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/clike/clike.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/clike/clike.jsindex 12005b1202..8ad5af08ee 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/clike/clike.js+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/clike/clike.js@@ -629,6 +629,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {return state.tokenize(stream, state);},"'": function(stream) {+ if (stream.match(/^(\\[^'\s]+|[^\\'])'/)) return "string-2"stream.eatWhile(/[\w\$_\xa1-\uffff]/);return "atom";},diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/clojure/clojure.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/clojure/clojure.jsindex 3305165808..78bf286606 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/clojure/clojure.js+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/clojure/clojure.js@@ -281,6 +281,7 @@ CodeMirror.defineMode("clojure", function (options) {},closeBrackets: {pairs: "()[]{}\"\""},+ fold: "brace",lineComment: ";;"};});diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/crystal/crystal.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/crystal/crystal.jsindex 73b0dbe13c..b22c5dbe41 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/crystal/crystal.js+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/crystal/crystal.js@@ -379,7 +379,7 @@return "string";}- escaped = embed && stream.next() == "\\";+ escaped = stream.next() == "\\" && embed;} else {stream.next();escaped = false;diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/dart/dart.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/dart/dart.jsindex 340076712c..cbbf391cc5 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/dart/dart.js+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/dart/dart.js@@ -12,10 +12,10 @@"use strict";var keywords = ("this super static final const abstract class extends external factory " +- "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 extension on yield late required").split(" ");+ "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 extension " ++ "on yield late required sealed base interface when").split(" ");var blockKeywords = "try catch finally do else for if switch while".split(" ");var atoms = "true false null".split(" ");var builtins = "void bool num int double dynamic var String Null Never".split(" ");@@ -44,6 +44,8 @@blockKeywords: set(blockKeywords),builtin: set(builtins),atoms: set(atoms),+ // clike numbers without the suffixes, and with '_' separators.+ number: /^(?:0x[a-f\d_]+|(?:[\d_]+\.?[\d_]*|\.[\d_]+)(?:e[-+]?[\d_]+)?)/i,hooks: {"@": function(stream) {stream.eatWhile(/[\w\$_\.]/);diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/go/go.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/go/go.jsindex 8dbdc65d1c..bd54f1ab03 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/go/go.js+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/go/go.js@@ -46,11 +46,11 @@ CodeMirror.defineMode("go", function(config) {}if (/[\d\.]/.test(ch)) {if (ch == ".") {- stream.match(/^[0-9]+([eE][\-+]?[0-9]+)?/);+ stream.match(/^[0-9_]+([eE][\-+]?[0-9_]+)?/);} else if (ch == "0") {- stream.match(/^[xX][0-9a-fA-F]+/) || stream.match(/^0[0-7]+/);+ stream.match(/^[xX][0-9a-fA-F_]+/) || stream.match(/^[0-7_]+/);} else {- stream.match(/^[0-9]*\.?[0-9]*([eE][\-+]?[0-9]+)?/);+ stream.match(/^[0-9_]*\.?[0-9_]*([eE][\-+]?[0-9_]+)?/);}return "number";}diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/groovy/groovy.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/groovy/groovy.jsindex 89d0fe0854..24d886ebb1 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/groovy/groovy.js+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/groovy/groovy.js@@ -129,10 +129,8 @@ CodeMirror.defineMode("groovy", function(config) {function tokenVariableDeref(stream, state) {var next = stream.match(/^(\.|[\w\$_]+)/)- if (!next) {- state.tokenize.pop()- return state.tokenize[state.tokenize.length-1](stream, state)- }+ if (!next || !stream.match(next[0] == "." ? /^[\w$_]/ : /^\./)) state.tokenize.pop()+ if (!next) return state.tokenize[state.tokenize.length-1](stream, state)return next[0] == "." ? null : "variable"}diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/jsx/jsx.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/jsx/jsx.jsindex 1406ef195d..35ac608e16 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/jsx/jsx.js+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/jsx/jsx.js@@ -103,7 +103,8 @@}function jsToken(stream, state, cx) {- if (stream.peek() == "<" && jsMode.expressionAllowed(stream, cx.state)) {+ if (stream.peek() == "<" && !stream.match(/^<([^<>]|<[^>]*>)+,\s*>/, false) &&+ jsMode.expressionAllowed(stream, cx.state)) {state.context = new Context(CodeMirror.startState(xmlMode, jsMode.indent(cx.state, "", "")),xmlMode, 0, state.context)jsMode.skipExpression(cx.state)diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/nsis/nsis.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/nsis/nsis.jsindex 2173916bb2..de18871251 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/nsis/nsis.js+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/nsis/nsis.js@@ -24,7 +24,7 @@ CodeMirror.defineSimpleMode("nsis",{{ regex: /`(?:[^\\`]|\\.)*`?/, token: "string" },// Compile Time Commands- {regex: /^\s*(?:\!(addincludedir|addplugindir|appendfile|cd|define|delfile|echo|error|execute|finalize|getdllversion|gettlbversion|include|insertmacro|macro|macroend|makensis|packhdr|pragma|searchparse|searchreplace|system|tempfile|undef|uninstfinalize|verbose|warning))\b/i, token: "keyword"},+ {regex: /^\s*(?:\!(addincludedir|addplugindir|appendfile|assert|cd|define|delfile|echo|error|execute|finalize|getdllversion|gettlbversion|include|insertmacro|macro|macroend|makensis|packhdr|pragma|searchparse|searchreplace|system|tempfile|undef|uninstfinalize|verbose|warning))\b/i, token: "keyword"},// Conditional Compilation{regex: /^\s*(?:\!(if(?:n?def)?|ifmacron?def|macro))\b/i, token: "keyword", indent: true},diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/shell/index.html b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/shell/index.htmlnew file mode 100644index 0000000000..ccaad3cbdf--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/shell/index.html@@ -0,0 +1,66 @@+<!doctype html>++<title>CodeMirror: Shell mode</title>+<meta charset="utf-8"/>+<link rel=stylesheet href="../../doc/docs.css">++<link rel=stylesheet href=../../lib/codemirror.css>+<script src=../../lib/codemirror.js></script>+<script src="../../addon/edit/matchbrackets.js"></script>+<script src=shell.js></script>+<style type=text/css>+ .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}+</style>+<div id=nav>+ <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>++ <ul>+ <li><a href="../../index.html">Home</a>+ <li><a href="../../doc/manual.html">Manual</a>+ <li><a href="https://github.com/codemirror/codemirror5">Code</a>+ </ul>+ <ul>+ <li><a href="../index.html">Language modes</a>+ <li><a class=active href="#">Shell</a>+ </ul>+</div>++<article>+<h2>Shell mode</h2>+++<textarea id=code>+#!/bin/bash++# clone the repository+git clone http://github.com/garden/tree++# generate HTTPS credentials+cd tree+openssl genrsa -aes256 -out https.key 1024+openssl req -new -nodes -key https.key -out https.csr+openssl x509 -req -days 365 -in https.csr -signkey https.key -out https.crt+cp https.key{,.orig}+openssl rsa -in https.key.orig -out https.key++# start the server in HTTPS mode+cd web+sudo node ../server.js 443 'yes' >> ../node.log &++# here is how to stop the server+for pid in `ps aux | grep 'node ../server.js' | awk '{print $2}'` ; do+ sudo kill -9 $pid 2> /dev/null+done++exit 0</textarea>++<script>+ var editor = CodeMirror.fromTextArea(document.getElementById('code'), {+ mode: 'shell',+ lineNumbers: true,+ matchBrackets: true+ });+</script>++<p><strong>MIME types defined:</strong> <code>text/x-sh</code>, <code>application/x-sh</code>.</p>+</article>diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/shell/shell.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/shell/shell.jsindex 9a8d95f7d8..c6be17c03a 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/shell/shell.js+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/shell/shell.js@@ -72,7 +72,7 @@ CodeMirror.defineMode('shell', function() {}if (ch == "<") {if (stream.match("<<")) return "operator"- var heredoc = stream.match(/^<-?\s*['"]?([a-zA-Z]*)['"]?/)+ var heredoc = stream.match(/^<-?\s*['"]?([a-zA-Z0-9]*)['"]?/)if (heredoc) {state.tokens.unshift(tokenHeredoc(heredoc[1]))return 'string-2'diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/sql/sql.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/sql/sql.jsindex 7b9dec7de1..d3983889f7 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/sql/sql.js+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/sql/sql.js@@ -417,7 +417,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {// For pl/pgsql lang - https://github.com/postgres/postgres/blob/REL_11_2/src/pl/plpgsql/src/pl_scanner.ckeywords: set(sqlKeywords + "a abort abs absent absolute access according action ada add admin after aggregate alias all allocate also alter always analyse analyze and any are array array_agg array_max_cardinality as asc asensitive assert assertion assignment asymmetric at atomic attach attribute attributes authorization avg backward base64 before begin begin_frame begin_partition bernoulli between bigint binary bit bit_length blob blocked bom boolean both breadth by c cache call called cardinality cascade cascaded case cast catalog catalog_name ceil ceiling chain char char_length character character_length character_set_catalog character_set_name character_set_schema characteristics characters check checkpoint class class_origin clob close cluster coalesce cobol collate collation collation_catalog collation_name collation_schema collect column column_name columns command_function command_function_code comment comments commit committed concurrently condition condition_number configuration conflict connect connection connection_name constant constraint constraint_catalog constraint_name constraint_schema constraints constructor contains content continue control conversion convert copy corr corresponding cost count covar_pop covar_samp create cross csv cube cume_dist current current_catalog current_date current_default_transform_group current_path current_role current_row current_schema current_time current_timestamp current_transform_group_for_type current_user cursor cursor_name cycle data database datalink datatype date datetime_interval_code datetime_interval_precision day db deallocate debug dec decimal declare default defaults deferrable deferred defined definer degree delete delimiter delimiters dense_rank depends depth deref derived desc describe descriptor detach detail deterministic diagnostics dictionary disable discard disconnect dispatch distinct dlnewcopy dlpreviouscopy dlurlcomplete dlurlcompleteonly dlurlcompletewrite dlurlpath dlurlpathonly dlurlpathwrite dlurlscheme dlurlserver dlvalue do document domain double drop dump dynamic dynamic_function dynamic_function_code each element else elseif elsif empty enable encoding encrypted end end_frame end_partition endexec enforced enum equals errcode error escape event every except exception exclude excluding exclusive exec execute exists exit exp explain expression extension external extract false family fetch file filter final first first_value flag float floor following for force foreach foreign fortran forward found frame_row free freeze from fs full function functions fusion g general generated get global go goto grant granted greatest group grouping groups handler having header hex hierarchy hint hold hour id identity if ignore ilike immediate immediately immutable implementation implicit import in include including increment indent index indexes indicator info inherit inherits initially inline inner inout input insensitive insert instance instantiable instead int integer integrity intersect intersection interval into invoker is isnull isolation join k key key_member key_type label lag language large last last_value lateral lead leading leakproof least left length level library like like_regex limit link listen ln load local localtime localtimestamp location locator lock locked log logged loop lower m map mapping match matched materialized max max_cardinality maxvalue member merge message message_length message_octet_length message_text method min minute minvalue mod mode modifies module month more move multiset mumps name names namespace national natural nchar nclob nesting new next nfc nfd nfkc nfkd nil no none normalize normalized not nothing notice notify notnull nowait nth_value ntile null nullable nullif nulls number numeric object occurrences_regex octet_length octets of off offset oids old on only open operator option options or order ordering ordinality others out outer output over overlaps overlay overriding owned owner p pad parallel parameter parameter_mode parameter_name parameter_ordinal_position parameter_specific_catalog parameter_specific_name parameter_specific_schema parser partial partition pascal passing passthrough password path percent percent_rank percentile_cont percentile_disc perform period permission pg_context pg_datatype_name pg_exception_context pg_exception_detail pg_exception_hint placing plans pli policy portion position position_regex power precedes preceding precision prepare prepared preserve primary print_strict_params prior privileges procedural procedure procedures program public publication query quote raise range rank read reads real reassign recheck recovery recursive ref references referencing refresh regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy reindex relative release rename repeatable replace replica requiring reset respect restart restore restrict result result_oid return returned_cardinality returned_length returned_octet_length returned_sqlstate returning returns reverse revoke right role rollback rollup routine routine_catalog routine_name routine_schema routines row row_count row_number rows rowtype rule savepoint scale schema schema_name schemas scope scope_catalog scope_name scope_schema scroll search second section security select selective self sensitive sequence sequences serializable server server_name session session_user set setof sets share show similar simple size skip slice smallint snapshot some source space specific specific_name specifictype sql sqlcode sqlerror sqlexception sqlstate sqlwarning sqrt stable stacked standalone start state statement static statistics stddev_pop stddev_samp stdin stdout storage strict strip structure style subclass_origin submultiset subscription substring substring_regex succeeds sum symmetric sysid system system_time system_user t table table_name tables tablesample tablespace temp template temporary text then ties time timestamp timezone_hour timezone_minute to token top_level_count trailing transaction transaction_active transactions_committed transactions_rolled_back transform transforms translate translate_regex translation treat trigger trigger_catalog trigger_name trigger_schema trim trim_array true truncate trusted type types uescape unbounded uncommitted under unencrypted union unique unknown unlink unlisten unlogged unnamed unnest until untyped update upper uri usage use_column use_variable user user_defined_type_catalog user_defined_type_code user_defined_type_name user_defined_type_schema using vacuum valid validate validator value value_of values var_pop var_samp varbinary varchar variable_conflict variadic varying verbose version versioning view views volatile warning when whenever where while whitespace width_bucket window with within without work wrapper write xml xmlagg xmlattributes xmlbinary xmlcast xmlcomment xmlconcat xmldeclaration xmldocument xmlelement xmlexists xmlforest xmliterate xmlnamespaces xmlparse xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltext xmlvalidate year yes zone"),// https://www.postgresql.org/docs/11/datatype.html- builtin: set("bigint int8 bigserial serial8 bit varying varbit boolean bool box bytea character char varchar cidr circle date double precision float8 inet integer int int4 interval json jsonb line lseg macaddr macaddr8 money numeric decimal path pg_lsn point polygon real float4 smallint int2 smallserial serial2 serial serial4 text time without zone with timetz timestamp timestamptz tsquery tsvector txid_snapshot uuid xml"),+ builtin: set("bigint int8 bigserial serial8 bit varying varbit boolean bool box bytea character char varchar cidr circle date double precision float8 inet integer int int4 interval json jsonb line lseg macaddr macaddr8 money numeric decimal path pg_lsn point polygon real float4 smallint int2 smallserial serial2 serial serial4 text time zone timetz timestamp timestamptz tsquery tsvector txid_snapshot uuid xml"),atoms: set("false true null unknown"),operatorChars: /^[*\/+\-%<>!=&|^\/#@?~]/,backslashStringEscapes: false,diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/yaml/yaml.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/yaml/yaml.jsindex 298db55f6f..895d1330a2 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/yaml/yaml.js+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/yaml/yaml.js@@ -85,7 +85,7 @@ CodeMirror.defineMode("yaml", function() {}/* pairs (associative arrays) -> key */- if (!state.pair && stream.match(/^\s*(?:[,\[\]{}&*!|>'"%@`][^\s'":]|[^,\[\]{}#&*!|>'"%@`])[^#]*?(?=\s*:($|\s))/)) {+ if (!state.pair && stream.match(/^\s*(?:[,\[\]{}&*!|>'"%@`][^\s'":]|[^\s,\[\]{}#&*!|>'"%@`])[^#:]*(?=:($|\s))/)) {state.pair = true;state.keyCol = stream.indentation();return "atom";diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/theme/duotone-dark.css b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/theme/duotone-dark.cssindex 88fdc76c8e..5373178e8d 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/theme/duotone-dark.css+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/theme/duotone-dark.css@@ -26,7 +26,7 @@ CodeMirror template by Jan T. Sott (https://github.com/idleberg), adapted by Bra.cm-s-duotone-dark span.cm-variable-2, .cm-s-duotone-dark span.cm-variable-3, .cm-s-duotone-dark span.cm-type, .cm-s-duotone-dark span.cm-string-2, .cm-s-duotone-dark span.cm-url { color: #7a63ee; }.cm-s-duotone-dark span.cm-def, .cm-s-duotone-dark span.cm-tag, .cm-s-duotone-dark span.cm-builtin, .cm-s-duotone-dark span.cm-qualifier, .cm-s-duotone-dark span.cm-header, .cm-s-duotone-dark span.cm-em { color: #eeebff; }-.cm-s-duotone-dark span.cm-bracket, .cm-s-duotone-dark span.cm-comment { color: #6c6783; }+.cm-s-duotone-dark span.cm-bracket, .cm-s-duotone-dark span.cm-comment { color: #a7a5b2; }/* using #f00 red for errors, don't think any of the colorscheme variables will stand out enough, ... maybe by giving it a background-color ... */.cm-s-duotone-dark span.cm-error, .cm-s-duotone-dark span.cm-invalidchar { color: #f00; }diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/theme/duotone-light.css b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/theme/duotone-light.cssindex d99480f7c4..a0a0b8336e 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/theme/duotone-light.css+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/theme/duotone-light.css@@ -25,7 +25,7 @@ CodeMirror template by Jan T. Sott (https://github.com/idleberg), adapted by Bra.cm-s-duotone-light span.cm-variable-2, .cm-s-duotone-light span.cm-variable-3, .cm-s-duotone-light span.cm-type, .cm-s-duotone-light span.cm-string-2, .cm-s-duotone-light span.cm-url { color: #896724; }.cm-s-duotone-light span.cm-def, .cm-s-duotone-light span.cm-tag, .cm-s-duotone-light span.cm-builtin, .cm-s-duotone-light span.cm-qualifier, .cm-s-duotone-light span.cm-header, .cm-s-duotone-light span.cm-em { color: #2d2006; }-.cm-s-duotone-light span.cm-bracket, .cm-s-duotone-light span.cm-comment { color: #b6ad9a; }+.cm-s-duotone-light span.cm-bracket, .cm-s-duotone-light span.cm-comment { color: #6f6e6a; }/* using #f00 red for errors, don't think any of the colorscheme variables will stand out enough, ... maybe by giving it a background-color ... *//* .cm-s-duotone-light span.cm-error { background: #896724; color: #728fcb; } */diff --git a/server-ee b/server-eeindex 4ff7692740..0e653a09c7 160000--- a/server-ee+++ b/server-ee@@ -1 +1 @@-Subproject commit 4ff7692740cb85539fac87b85205197cd6f69dde+Subproject commit 0e653a09c70eae4486e778069ae7a9718b5ee515