Skip to content

The Unified and Autonomous Development Platform

Fix issue #1333 - "Run"-step in Dockerfile isn't colored

Robin Shen79e40ca059e4
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/fold/foldgutter.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/fold/foldgutter.js
index 481fea2af9..8fc0e99474 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/fold/foldgutter.js
+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/fold/foldgutter.js
@@ -21,6 +21,7 @@
cm.off("fold", onFold);
cm.off("unfold", onFold);
cm.off("swapDoc", onChange);
+ cm.off("optionChange", optionChange);
}
if (val) {
cm.state.foldGutter = new State(parseOptions(val));
@@ -31,6 +32,7 @@
cm.on("fold", onFold);
cm.on("unfold", onFold);
cm.on("swapDoc", onChange);
+ cm.on("optionChange", optionChange);
}
});
@@ -120,6 +122,10 @@
else cm.foldCode(Pos(line, 0), opts);
}
+ function optionChange(cm, option) {
+ if (option == "mode") onChange(cm)
+ }
+
function onChange(cm) {
var state = cm.state.foldGutter;
if (!state) return;
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/hint/show-hint.css b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/hint/show-hint.css
index 5617ccca2b..d41031cdb8 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/hint/show-hint.css
+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/hint/show-hint.css
@@ -19,6 +19,7 @@
max-height: 20em;
overflow-y: auto;
+ box-sizing: border-box;
}
.CodeMirror-hint {
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/hint/show-hint.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/hint/show-hint.js
index be729c3efe..aaf1f643f4 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/hint/show-hint.js
+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/hint/show-hint.js
@@ -286,20 +286,14 @@
setTimeout(function() { startScroll = cm.getScrollInfo(); });
var overlapY = box.bottom - winH;
- if (overlapY > 0) {
- var height = box.bottom - box.top, curTop = pos.top - (pos.bottom - box.top);
- if (curTop - height > 0) { // Fits above cursor
- hints.style.top = (top = pos.top - height - offsetTop) + "px";
+ if (overlapY > 0) { // Does not fit below
+ var height = box.bottom - box.top, spaceAbove = box.top - (pos.bottom - pos.top) - 2
+ if (winH - box.top < spaceAbove) { // More room at the top
+ if (height > spaceAbove) hints.style.height = (height = spaceAbove) + "px";
+ hints.style.top = ((top = pos.top - height) + offsetTop) + "px";
below = false;
- } else if (height > winH) {
- hints.style.height = (winH - 5) + "px";
- hints.style.top = (top = pos.bottom - box.top - offsetTop) + "px";
- var cursor = cm.getCursor();
- if (data.from.ch != cursor.ch) {
- pos = cm.cursorCoords(cursor);
- hints.style.left = (left = pos.left - offsetLeft) + "px";
- box = hints.getBoundingClientRect();
- }
+ } else {
+ hints.style.height = (winH - box.top - 2) + "px";
}
}
var overlapX = box.right - winW;
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/hint/sql-hint.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/hint/sql-hint.js
index 57c3b64f26..5c9810537a 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/hint/sql-hint.js
+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/hint/sql-hint.js
@@ -23,16 +23,16 @@
function isArray(val) { return Object.prototype.toString.call(val) == "[object Array]" }
+ function getModeConf(editor, field) {
+ return editor.getModeAt(editor.getCursor()).config[field] || CodeMirror.resolveMode("text/x-sql")[field]
+ }
+
function getKeywords(editor) {
- var mode = editor.doc.modeOption;
- if (mode === "sql") mode = "text/x-sql";
- return CodeMirror.resolveMode(mode).keywords;
+ return getModeConf(editor, "keywords") || []
}
function getIdentifierQuote(editor) {
- var mode = editor.doc.modeOption;
- if (mode === "sql") mode = "text/x-sql";
- return CodeMirror.resolveMode(mode).identifierQuote || "`";
+ return getModeConf(editor, "identifierQuote") || "`";
}
function getText(item) {
@@ -109,9 +109,9 @@
var nameParts = getText(name).split(".");
for (var i = 0; i < nameParts.length; i++)
nameParts[i] = identifierQuote +
- // duplicate identifierQuotes
- nameParts[i].replace(new RegExp(identifierQuote,"g"), identifierQuote+identifierQuote) +
- identifierQuote;
+ // duplicate identifierQuotes
+ nameParts[i].replace(new RegExp(identifierQuote,"g"), identifierQuote+identifierQuote) +
+ identifierQuote;
var escaped = nameParts.join(".");
if (typeof name == "string") return escaped;
name = shallowClone(name);
@@ -283,21 +283,21 @@
}
return w;
};
- addMatches(result, search, defaultTable, function(w) {
+ addMatches(result, search, defaultTable, function(w) {
return objectOrClass(w, "CodeMirror-hint-table CodeMirror-hint-default-table");
- });
- addMatches(
+ });
+ addMatches(
result,
search,
tables, function(w) {
return objectOrClass(w, "CodeMirror-hint-table");
}
- );
- if (!disableKeywords)
- addMatches(result, search, keywords, function(w) {
+ );
+ if (!disableKeywords)
+ addMatches(result, search, keywords, function(w) {
return objectOrClass(w.toUpperCase(), "CodeMirror-hint-keyword");
- });
- }
+ });
+ }
return {list: result, from: Pos(cur.line, start), to: Pos(cur.line, end)};
});
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/merge/merge.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/merge/merge.js
index a5ba21aa84..14362fa6e9 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/merge/merge.js
+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/merge/merge.js
@@ -610,11 +610,11 @@
lock.setAttribute("tabindex", "0");
var lockWrap = elt("div", [lock], "CodeMirror-merge-scrolllock-wrap");
CodeMirror.on(lock, "click", function() { setScrollLock(dv, !dv.lockScroll); });
- CodeMirror.on(lock, "keyup", function(e) { e.key === "Enter" && setScrollLock(dv, !dv.lockScroll); });
+ CodeMirror.on(lock, "keyup", function(e) { (e.key === "Enter" || e.code === "Space") && setScrollLock(dv, !dv.lockScroll); });
var gapElts = [lockWrap];
if (dv.mv.options.revertButtons !== false) {
dv.copyButtons = elt("div", null, "CodeMirror-merge-copybuttons-" + dv.type);
- function copyButtons(e) {
+ var copyButtons = function(e) {
var node = e.target || e.srcElement;
if (!node.chunk) return;
if (node.className == "CodeMirror-merge-copy-reverse") {
@@ -624,7 +624,7 @@
copyChunk(dv, dv.edit, dv.orig, node.chunk);
}
CodeMirror.on(dv.copyButtons, "click", copyButtons);
- CodeMirror.on(dv.copyButtons, "keyup", function(e) { e.key === "Enter" && copyButtons(e); });
+ CodeMirror.on(dv.copyButtons, "keyup", function(e) { (e.key === "Enter" || e.code === "Space") && copyButtons(e); });
gapElts.unshift(dv.copyButtons);
}
if (dv.mv.options.connect != "align") {
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/runmode/runmode-standalone.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/runmode/runmode-standalone.js
index 64af21acec..441522a009 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/runmode/runmode-standalone.js
+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/runmode/runmode-standalone.js
@@ -105,7 +105,7 @@
}
} else {
var match = this.string.slice(this.pos).match(pattern);
- if (match && (match.index > 0 || /* fix infinite loop issue */ match[0].length == 0)) return null;
+ if (match && match.index > 0) { return null }
if (match && consume !== false) { this.pos += match[0].length; }
return match
}
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.js
index 3cfd53d9e0..b53a776aef 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
@@ -872,7 +872,7 @@
}
} else {
var match = this.string.slice(this.pos).match(pattern);
- if (match && (match.index > 0 || /* fix infinite loop issue */ match[0].length == 0)) return null;
+ if (match && match.index > 0) { return null }
if (match && consume !== false) { this.pos += match[0].length; }
return match
}
@@ -4415,6 +4415,8 @@
d.scroller.setAttribute("tabIndex", "-1");
// The element in which the editor lives.
d.wrapper = elt("div", [d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror");
+ // See #6982. FIXME remove when this has been fixed for a while in Chrome
+ if (chrome && chrome_version >= 105) { d.wrapper.style.clipPath = "inset(0px)"; }
// This attribute is respected by automatic translation systems such as Google Translate,
// and may also be respected by tools used by human translators.
@@ -7772,7 +7774,7 @@
for (var i = newBreaks.length - 1; i >= 0; i--)
{ replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length)); }
});
- option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b\u200e\u200f\u2028\u2029\ufeff\ufff9-\ufffc]/g, function (cm, val, old) {
+ option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b\u200e\u200f\u2028\u2029\u202d\u202e\u2066\u2067\u2069\ufeff\ufff9-\ufffc]/g, function (cm, val, old) {
cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g");
if (old != Init) { cm.refresh(); }
});
@@ -8257,8 +8259,8 @@
}
function disableBrowserMagic(field, spellcheck, autocorrect, autocapitalize) {
- field.setAttribute("autocorrect", autocorrect ? "" : "off");
- field.setAttribute("autocapitalize", autocapitalize ? "" : "off");
+ field.setAttribute("autocorrect", autocorrect ? "on" : "off");
+ field.setAttribute("autocapitalize", autocapitalize ? "on" : "off");
field.setAttribute("spellcheck", !!spellcheck);
}
@@ -8273,7 +8275,6 @@
else { te.setAttribute("wrap", "off"); }
// If border: 0; -- iOS fails to open keyboard (issue #1287)
if (ios) { te.style.border = "1px solid black"; }
- disableBrowserMagic(te);
return div
}
@@ -8895,6 +8896,7 @@
}
// Old-fashioned briefly-focus-a-textarea hack
var kludge = hiddenTextarea(), te = kludge.firstChild;
+ disableBrowserMagic(te);
cm.display.lineSpace.insertBefore(kludge, cm.display.lineSpace.firstChild);
te.value = lastCopied.text.join("\n");
var hadFocus = activeElt(div.ownerDocument);
@@ -9368,6 +9370,7 @@
// Used to work around IE issue with selection being forgotten when focus moves away from textarea
this.hasSelection = false;
this.composing = null;
+ this.resetting = false;
};
TextareaInput.prototype.init = function (display) {
@@ -9458,6 +9461,8 @@
// The semihidden textarea that is focused when the editor is
// focused, and receives input.
this.textarea = this.wrapper.firstChild;
+ var opts = this.cm.options;
+ disableBrowserMagic(this.textarea, opts.spellcheck, opts.autocorrect, opts.autocapitalize);
};
TextareaInput.prototype.screenReaderLabelChanged = function (label) {
@@ -9500,8 +9505,9 @@
// Reset the input to correspond to the selection (or to be empty,
// when not typing and nothing is selected)
TextareaInput.prototype.reset = function (typing) {
- if (this.contextMenuPending || this.composing) { return }
+ if (this.contextMenuPending || this.composing && typing) { return }
var cm = this.cm;
+ this.resetting = true;
if (cm.somethingSelected()) {
this.prevInput = "";
var content = cm.getSelection();
@@ -9512,6 +9518,7 @@
this.prevInput = this.textarea.value = "";
if (ie && ie_version >= 9) { this.hasSelection = null; }
}
+ this.resetting = false;
};
TextareaInput.prototype.getField = function () { return this.textarea };
@@ -9573,7 +9580,7 @@
// possible when it is clear that nothing happened. hasSelection
// will be the case when there is a lot of text in the textarea,
// in which case reading its value would be expensive.
- if (this.contextMenuPending || !cm.state.focused ||
+ if (this.contextMenuPending || this.resetting || !cm.state.focused ||
(hasSelection(input) && !prevInput && !this.composing) ||
cm.isReadOnly() || cm.options.disableInput || cm.state.keySeq)
{ return false }
@@ -9860,7 +9867,7 @@
addLegacyProps(CodeMirror);
- CodeMirror.version = "5.65.7";
+ CodeMirror.version = "5.65.12";
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.js
index f0d75a48ff..97e39072cc 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
@@ -528,8 +528,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
name: "clike",
keywords: words("abstract as async await base break case catch checked class const continue" +
" default delegate do else enum event explicit extern finally fixed for" +
- " foreach goto if implicit in interface internal is lock namespace new" +
- " operator out override params private protected public readonly ref return sealed" +
+ " foreach goto if implicit in init interface internal is lock namespace new" +
+ " operator out override params private protected public readonly record ref required return sealed" +
" sizeof stackalloc static struct switch this throw try typeof unchecked" +
" unsafe using virtual void volatile while add alias ascending descending dynamic from get" +
" global group into join let orderby partial remove select set value var yield"),
@@ -538,7 +538,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
" UInt64 bool byte char decimal double short int long object" +
" sbyte float string ushort uint ulong"),
blockKeywords: words("catch class do else finally for foreach if struct switch try while"),
- defKeywords: words("class interface namespace struct var"),
+ defKeywords: words("class interface namespace record struct var"),
typeFirstDefinitions: true,
atoms: words("true false null"),
hooks: {
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/javascript/javascript.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/javascript/javascript.js
index 48a46d65d0..bb735ebc96 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/javascript/javascript.js
+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/javascript/javascript.js
@@ -779,7 +779,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
if (type == "async" ||
(type == "variable" &&
(value == "static" || value == "get" || value == "set" || (isTS && isModifier(value))) &&
- cx.stream.match(/^\s+[\w$\xa1-\uffff]/, false))) {
+ cx.stream.match(/^\s+#?[\w$\xa1-\uffff]/, false))) {
cx.marked = "keyword";
return cont(classBody);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/jinja2/jinja2.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/jinja2/jinja2.js
index ace1f1f3fc..ec6f9903c6 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/jinja2/jinja2.js
+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/jinja2/jinja2.js
@@ -13,18 +13,18 @@
CodeMirror.defineMode("jinja2", function() {
var keywords = ["and", "as", "block", "endblock", "by", "cycle", "debug", "else", "elif",
- "extends", "filter", "endfilter", "firstof", "for",
+ "extends", "filter", "endfilter", "firstof", "do", "for",
"endfor", "if", "endif", "ifchanged", "endifchanged",
- "ifequal", "endifequal", "ifnotequal",
+ "ifequal", "endifequal", "ifnotequal", "set", "raw", "endraw",
"endifnotequal", "in", "include", "load", "not", "now", "or",
- "parsed", "regroup", "reversed", "spaceless",
- "endspaceless", "ssi", "templatetag", "openblock",
- "closeblock", "openvariable", "closevariable",
+ "parsed", "regroup", "reversed", "spaceless", "call", "endcall", "macro",
+ "endmacro", "endspaceless", "ssi", "templatetag", "openblock",
+ "closeblock", "openvariable", "closevariable", "without", "context",
"openbrace", "closebrace", "opencomment",
"closecomment", "widthratio", "url", "with", "endwith",
"get_current_language", "trans", "endtrans", "noop", "blocktrans",
"endblocktrans", "get_available_languages",
- "get_current_language_bidi", "plural"],
+ "get_current_language_bidi", "pluralize", "autoescape", "endautoescape"],
operator = /^[+\-*&%=<>!?|~^]/,
sign = /^[:\[\(\{]/,
atom = ["true", "false"],
@@ -78,7 +78,24 @@
state.instring = ch;
stream.next();
return "string";
- } else if(stream.match(state.intag + "}") || stream.eat("-") && stream.match(state.intag + "}")) {
+ }
+ else if (state.inbraces > 0 && ch ==")") {
+ stream.next()
+ state.inbraces--;
+ }
+ else if (ch == "(") {
+ stream.next()
+ state.inbraces++;
+ }
+ else if (state.inbrackets > 0 && ch =="]") {
+ stream.next()
+ state.inbrackets--;
+ }
+ else if (ch == "[") {
+ stream.next()
+ state.inbrackets++;
+ }
+ else if (!state.lineTag && (stream.match(state.intag + "}") || stream.eat("-") && stream.match(state.intag + "}"))) {
state.intag = false;
return "tag";
} else if(stream.match(operator)) {
@@ -87,6 +104,10 @@
} else if(stream.match(sign)) {
state.sign = true;
} else {
+ if (stream.column() == 1 && state.lineTag && stream.match(keywords)) {
+ //allow nospace after tag before the keyword
+ return "keyword";
+ }
if(stream.eat(" ") || stream.sol()) {
if(stream.match(keywords)) {
return "keyword";
@@ -120,25 +141,51 @@
} else if (ch = stream.eat(/\{|%/)) {
//Cache close tag
state.intag = ch;
+ state.inbraces = 0;
+ state.inbrackets = 0;
if(ch == "{") {
state.intag = "}";
}
stream.eat("-");
return "tag";
}
+ //Line statements
+ } else if (stream.eat('#')) {
+ if (stream.peek() == '#') {
+ stream.skipToEnd();
+ return "comment"
+ }
+ else if (!stream.eol()) {
+ state.intag = true;
+ state.lineTag = true;
+ state.inbraces = 0;
+ state.inbrackets = 0;
+ return "tag";
+ }
}
stream.next();
};
return {
startState: function () {
- return {tokenize: tokenBase};
+ return {
+ tokenize: tokenBase,
+ inbrackets:0,
+ inbraces:0
+ };
},
- token: function (stream, state) {
- return state.tokenize(stream, state);
+ token: function(stream, state) {
+ var style = state.tokenize(stream, state);
+ if (stream.eol() && state.lineTag && !state.instring && state.inbraces == 0 && state.inbrackets == 0) {
+ //Close line statement at the EOL
+ state.intag = false
+ state.lineTag = false
+ }
+ return style;
},
blockCommentStart: "{#",
- blockCommentEnd: "#}"
+ blockCommentEnd: "#}",
+ lineComment: "##",
};
});
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.js
index b84ecc2167..2173916bb2 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
@@ -40,7 +40,7 @@ CodeMirror.defineSimpleMode("nsis",{
{regex: /\b(?:admin|all|amd64-unicode|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|x-86-(ansi|unicode)|zlib)\b/i, 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)\}/i, token: "variable-2", indent: true},
+ {regex: /\$\{(?:And(?:If(?:Not)?|Unless)|Break|Case(?:2|3|4|5|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)\}/i, token: "variable-2", indent: true},
// FileFunc.nsh
{regex: /\$\{(?:BannerTrimPath|DirState|DriveSpace|Get(BaseName|Drives|ExeName|ExePath|FileAttributes|FileExt|FileName|FileVersion|Options|OptionsS|Parameters|Parent|Root|Size|Time)|Locate|RefreshShellIcons)\}/i, token: "variable-2", dedent: true},
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/pegjs/pegjs.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/pegjs/pegjs.js
index c0ed2fcc06..c0012c5cf2 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/pegjs/pegjs.js
+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/pegjs/pegjs.js
@@ -31,8 +31,6 @@ CodeMirror.defineMode("pegjs", function (config) {
};
},
token: function (stream, state) {
- if (stream)
-
//check for state changes
if (!state.inString && !state.inComment && ((stream.peek() == '"') || (stream.peek() == "'"))) {
state.stringType = stream.peek();
@@ -43,7 +41,6 @@ CodeMirror.defineMode("pegjs", function (config) {
state.inComment = true;
}
- //return state
if (state.inString) {
while (state.inString && !stream.eol()) {
if (stream.peek() === state.stringType) {
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/python/python.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/python/python.js
index 1cec2de886..3946ceeeb0 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/python/python.js
+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/python/python.js
@@ -20,7 +20,7 @@
"def", "del", "elif", "else", "except", "finally",
"for", "from", "global", "if", "import",
"lambda", "pass", "raise", "return",
- "try", "while", "with", "yield", "in"];
+ "try", "while", "with", "yield", "in", "False", "True"];
var commonBuiltins = ["abs", "all", "any", "bin", "bool", "bytearray", "callable", "chr",
"classmethod", "compile", "complex", "delattr", "dict", "dir", "divmod",
"enumerate", "eval", "filter", "float", "format", "frozenset",
@@ -32,7 +32,7 @@
"sorted", "staticmethod", "str", "sum", "super", "tuple",
"type", "vars", "zip", "__import__", "NotImplemented",
"Ellipsis", "__debug__"];
- CodeMirror.registerHelper("hintWords", "python", commonKeywords.concat(commonBuiltins));
+ CodeMirror.registerHelper("hintWords", "python", commonKeywords.concat(commonBuiltins).concat(["exec", "print"]));
function top(state) {
return state.scopes[state.scopes.length - 1];
@@ -60,7 +60,7 @@
if (py3) {
// since http://legacy.python.org/dev/peps/pep-0465/ @ is also an operator
var identifiers = parserConf.identifiers|| /^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*/;
- myKeywords = myKeywords.concat(["nonlocal", "False", "True", "None", "async", "await"]);
+ myKeywords = myKeywords.concat(["nonlocal", "None", "aiter", "anext", "async", "await", "breakpoint", "match", "case"]);
myBuiltins = myBuiltins.concat(["ascii", "bytes", "exec", "print"]);
var stringPrefixes = new RegExp("^(([rbuf]|(br)|(rb)|(fr)|(rf))?('{3}|\"{3}|['\"]))", "i");
} else {
@@ -68,7 +68,7 @@
myKeywords = myKeywords.concat(["exec", "print"]);
myBuiltins = myBuiltins.concat(["apply", "basestring", "buffer", "cmp", "coerce", "execfile",
"file", "intern", "long", "raw_input", "reduce", "reload",
- "unichr", "unicode", "xrange", "False", "True", "None"]);
+ "unichr", "unicode", "xrange", "None"]);
var stringPrefixes = new RegExp("^(([rubf]|(ur)|(br))?('{3}|\"{3}|['\"]))", "i");
}
var keywords = wordRegexp(myKeywords);
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/sparql/sparql.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/sparql/sparql.js
index 5e68f5670d..6d928b5cde 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/sparql/sparql.js
+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/sparql/sparql.js
@@ -33,6 +33,9 @@ CodeMirror.defineMode("sparql", function(config) {
"true", "false", "with",
"data", "copy", "to", "move", "add", "create", "drop", "clear", "load", "into"]);
var operatorChars = /[*+\-<>=&|\^\/!\?]/;
+ var PN_CHARS = "[A-Za-z_\\-0-9]";
+ var PREFIX_START = new RegExp("[A-Za-z]");
+ var PREFIX_REMAINDER = new RegExp("((" + PN_CHARS + "|\\.)*(" + PN_CHARS + "))?:");
function tokenBase(stream, state) {
var ch = stream.next();
@@ -71,20 +74,18 @@ CodeMirror.defineMode("sparql", function(config) {
stream.eatWhile(/[a-z\d\-]/i);
return "meta";
}
- else {
- stream.eatWhile(/[_\w\d]/);
- if (stream.eat(":")) {
+ else if (PREFIX_START.test(ch) && stream.match(PREFIX_REMAINDER)) {
eatPnLocal(stream);
return "atom";
- }
- var word = stream.current();
- if (ops.test(word))
- return "builtin";
- else if (keywords.test(word))
- return "keyword";
- else
- return "variable";
}
+ stream.eatWhile(/[_\w\d]/);
+ var word = stream.current();
+ if (ops.test(word))
+ return "builtin";
+ else if (keywords.test(word))
+ return "keyword";
+ else
+ return "variable";
}
function eatPnLocal(stream) {
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.js
index 105b22ffb9..7b9dec7de1 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
@@ -94,9 +94,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
return "number";
if (stream.match(/^\.+/))
return null
- // .table_name (ODBC)
- // // ref: https://dev.mysql.com/doc/refman/8.0/en/identifier-qualifiers.html
- if (support.ODBCdotTable && stream.match(/^[\w\d_$#]+/))
+ if (stream.match(/^[\w\d_$#]+/))
return "variable-2";
} else if (operatorChars.test(ch)) {
// operators
@@ -207,7 +205,8 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
blockCommentStart: "/*",
blockCommentEnd: "*/",
lineComment: support.commentSlashSlash ? "//" : support.commentHash ? "#" : "--",
- closeBrackets: "()[]{}''\"\"``"
+ closeBrackets: "()[]{}''\"\"``",
+ config: parserConfig
};
});
@@ -294,7 +293,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
builtin: set(defaultBuiltin),
atoms: set("false true null unknown"),
dateSQL: set("date time timestamp"),
- support: set("ODBCdotTable doubleQuote binaryNumber hexNumber")
+ support: set("doubleQuote binaryNumber hexNumber")
});
CodeMirror.defineMIME("text/x-mssql", {
@@ -321,7 +320,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
atoms: set("false true null unknown"),
operatorChars: /^[*+\-%<>!=&|^]/,
dateSQL: set("date time timestamp"),
- support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"),
+ support: set("decimallessFloat zerolessFloat binaryNumber hexNumber doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"),
hooks: {
"@": hookVar,
"`": hookIdentifier,
@@ -337,7 +336,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
atoms: set("false true null unknown"),
operatorChars: /^[*+\-%<>!=&|^]/,
dateSQL: set("date time timestamp"),
- support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"),
+ support: set("decimallessFloat zerolessFloat binaryNumber hexNumber doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"),
hooks: {
"@": hookVar,
"`": hookIdentifier,
@@ -408,7 +407,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
atoms: set("false true null unknown"),
operatorChars: /^[*+\-%<>!=]/,
dateSQL: set("date timestamp"),
- support: set("ODBCdotTable doubleQuote binaryNumber hexNumber")
+ support: set("doubleQuote binaryNumber hexNumber")
});
CodeMirror.defineMIME("text/x-pgsql", {
@@ -423,7 +422,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
operatorChars: /^[*\/+\-%<>!=&|^\/#@?~]/,
backslashStringEscapes: false,
dateSQL: set("date time timestamp"),
- support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber nCharCast charsetCast escapeConstant")
+ support: set("decimallessFloat zerolessFloat binaryNumber hexNumber nCharCast charsetCast escapeConstant")
});
// Google's SQL-like query language, GQL
@@ -445,7 +444,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
atoms: set("false true null unknown"),
operatorChars: /^[*+\-%<>!=&|^\/#@?~]/,
dateSQL: set("date time timestamp"),
- support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber nCharCast charsetCast")
+ support: set("decimallessFloat zerolessFloat binaryNumber hexNumber nCharCast charsetCast")
});
// Spark SQL
@@ -456,7 +455,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
atoms: set("false true null"),
operatorChars: /^[*\/+\-%<>!=~&|^]/,
dateSQL: set("date time timestamp"),
- support: set("ODBCdotTable doubleQuote zerolessFloat")
+ support: set("doubleQuote zerolessFloat")
});
// Esper
@@ -489,7 +488,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
dateSQL: set("date time timestamp zone"),
// hexNumber is necessary for VARBINARY literals, e.g. X'65683F'
// but it also enables 0xFF hex numbers, which Trino doesn't support.
- support: set("ODBCdotTable decimallessFloat zerolessFloat hexNumber")
+ support: set("decimallessFloat zerolessFloat hexNumber")
});
});
@@ -507,7 +506,6 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
Commands parsed and executed by the client (not the server).
support:
A list of supported syntaxes which are not common, but are supported by more than 1 DBMS.
- * ODBCdotTable: .tableName
* zerolessFloat: .1
* decimallessFloat: 1.
* hexNumber: X'01AF' X'01af' x'01AF' x'01af' 0x01AF 0x01af
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/swift/swift.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/swift/swift.js
index 1edc7907d8..4edc4507ae 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/swift/swift.js
+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/swift/swift.js
@@ -143,14 +143,12 @@
function tokenComment(stream, state) {
var ch
- while (true) {
- stream.match(/^[^/*]+/, true)
- ch = stream.next()
- if (!ch) break
+ while (ch = stream.next()) {
if (ch === "/" && stream.eat("*")) {
state.tokenize.push(tokenComment)
} else if (ch === "*" && stream.eat("/")) {
state.tokenize.pop()
+ break
}
}
return "comment"
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/theme/bespin.css b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/theme/bespin.css
index 60913ba938..3fd3d93a5a 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/theme/bespin.css
+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/theme/bespin.css
@@ -9,7 +9,7 @@
*/
.cm-s-bespin.CodeMirror {background: #28211c; color: #9d9b97;}
-.cm-s-bespin div.CodeMirror-selected {background: #36312e !important;}
+.cm-s-bespin div.CodeMirror-selected {background: #59554f !important;}
.cm-s-bespin .CodeMirror-gutters {background: #28211c; border-right: 0px;}
.cm-s-bespin .CodeMirror-linenumber {color: #666666;}
.cm-s-bespin .CodeMirror-cursor {border-left: 1px solid #797977 !important;}