CoffeeScript mode
+ + + +MIME types defined: application/vnd.coffeescript, text/coffeescript, text/x-coffeescript.
The CoffeeScript mode was written by Jeff Pickhardt.
+ +Version 5.x
+20-05-2020: Version 5.54.0:
+ +-
+
- runmode addon: Properly support for cross-line lookahead. +
- vim bindings: Allow Ex-Commands with non-word names. +
- gfm mode: Add a
fencedCodeBlockDefaultModeoption.
+ - Improve support for having focus inside in-editor widgets in contenteditable-mode. +
- Fix issue where the scroll position could jump when clicking on a selection in Chrome. +
- python mode: Better format string support. +
- javascript mode: Improve parsing of private properties and class fields. +
- matchbrackets addon: Disable highlighting when the editor doesn’t have focus. +
21-04-2020: Version 5.53.2:
+ +-
+
- show-hint addon: Fix a regression that broke completion picking. +
21-04-2020: Version 5.53.0:
+ +-
+
- New option:
screenReaderLabelto add a label to the editor.
+ - New mode: wast. +
- Fix a bug where the editor layout could remain confused after a call to
refreshwhen line wrapping was enabled.
+ - dialog addon: Don’t close dialogs when the document window loses focus. +
- merge addon: Compensate for editor top position when aligning lines. +
- vim bindings: Improve EOL handling. +
- emacs bindings: Include default keymap as a fallback. +
- julia mode: Fix an infinite loop bug. +
- show-hint addon: Scroll cursor into view when picking a completion. +
20-03-2020: Version 5.52.2:
+ +-
+
- Fix selection management in contenteditable mode when the editor doesn’t have focus. +
- Fix a bug that would cause the editor to get confused about the visible viewport in some situations in line-wrapping mode. +
- markdown mode: Don’t treat single dashes as setext header markers. +
- zenburn theme: Make sure background styles take precedence over default styles. +
- css mode: Recognize a number of new properties. +
20-02-2020: Version 5.52.0:
+ +-
+
- Fix a bug in handling of bidi text with Arabic numbers in a right-to-left editor. +
- Fix a crash when combining file drop with a
"beforeChange"filter.
+ - Prevent issue when passing negative coordinates to
scrollTo.
+ - lint and tern addons: Allow the tooltip to be appended to the editor wrapper element instead of the document body. +
20-01-2020: Version 5.51.0:
+ +-
+
- Fix the behavior of the home and end keys when
directionis set to"rtl".
+ - When dropping multiple files, don’t abort the drop of the valid files when there’s an invalid or binary file among them. +
- Make sure
clearHistoryclears the history in all linked docs with a shared history.
+ - vim bindings: Fix behavior of
'and`marks, fixRin visual mode.
+ - vim bindings: Support
gi,gI, andgJ.
+
01-01-2020: Version 5.50.2:
+ +-
+
- Fix bug that broke removal of line widgets. +
20-12-2019: Version 5.50.0:
+ +-
+
- Add a
classNameoption toaddLineWidget.
+ - foldcode addon: Allow fold widgets to be functions, to dynamically create fold markers. +
- New themes: ayu-dark and ayu-mirage. +
- Make Shift-Delete to cut work on Firefox. +
- closetag addon: Properly handle self-closing tags. +
- handlebars mode: Fix triple-brace support. +
- searchcursor addon: Support mathing
$in reverse regexp search.
+ - panel addon: Don’t get confused by changing panel sizes. +
- javascript-hint addon: Complete variables defined in outer scopes. +
- sublime bindings: Make by-subword motion more consistent with Sublime Text. +
- julia mode: Don’t break on zero-prefixed integers. +
- elm mode: Sync with upstream version. +
- sql mode: Support Postgres-style backslash-escaped string literals. +
21-10-2019: Version 5.49.2:
+ +-
+
- sublime bindings: Make
selectNextOccurrencestop doing something when all occurrences are selected.
+ - continuecomment addon: Respect
indentWithTabsoption.
+ - foldgutter addon: Optimize by reusing DOM when possible. +
- markdown mode: Don’t reset inline styles at the start of a continued list item line. +
- clike mode: Add a configuration for Objective-C++. +
20-09-2019: Version 5.49.0:
+ +-
+
- New themes: moxer, material-darker, material-palenight, material-ocean. +
- xml mode: Provide a more abstract way to query context, which other modes for XML-like languages can also implement. +
- octave mode: Don’t mark common punctuation as error. +
- clike mode: Support nested comments and properly indent lambdas in Kotlin. +
- foldgutter and annotatescrollbar addons: Optimize use of
setTimeout/clearTimeout.
+
20-08-2019: Version 5.48.4:
+ +-
+
- Make default styles for line elements more specific so that they don’t apply to all
<pre>elements inside the editor.
+ - Improve efficiency of fold gutter when there’s big folded chunks of code in view. +
- Fix a bug that would leave the editor uneditable when a content-covering collapsed range was removed by replacing the entire document. +
- julia mode: Support number separators. +
- asterisk mode: Improve comment support. +
- handlebars mode: Support triple-brace tags. +
20-07-2019: Version 5.48.2:
+ +-
+
- vim bindings: Adjust char escape substitution to match vim, support
&/$0.
+ - search addon: Try to make backslash behavior in query strings less confusing. +
- javascript mode: Handle numeric separators, strings in arrow parameter defaults, and TypeScript
inoperator in index types.
+ - sparql mode: Allow non-ASCII identifier characters. +
20-06-2019: Version 5.48.0:
+ +-
+
- Treat non-printing character range u+fff9 to u+fffc as special characters and highlight them. +
- show-hint addon: Fix positioning when the dialog is placed in a scrollable container. +
- Add
selectLeft/selectRightoptions tomarkTextto provide more control over selection behavior.
+
21-05-2019: Version 5.47.0:
+ +-
+
- python mode: Properly handle
...syntax.
+ - ruby mode: Fix indenting before closing brackets. +
- vim bindings: Fix repeat for
C-v I, fix handling of fat cursorC-v c Escand0, fix@@, fix block-wise yank.
+ - vim bindings: Add support for
`text object.
+
22-04-2019: Version 5.46.0:
-
diff --git a/src/codemirror/doc/reporting.html b/src/assets/plugins/codemirror/doc/reporting.html
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/doc/reporting.html
rename to src/assets/plugins/codemirror/doc/reporting.html
diff --git a/src/codemirror/doc/upgrade_v2.2.html b/src/assets/plugins/codemirror/doc/upgrade_v2.2.html
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/doc/upgrade_v2.2.html
rename to src/assets/plugins/codemirror/doc/upgrade_v2.2.html
diff --git a/src/codemirror/doc/upgrade_v3.html b/src/assets/plugins/codemirror/doc/upgrade_v3.html
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/doc/upgrade_v3.html
rename to src/assets/plugins/codemirror/doc/upgrade_v3.html
diff --git a/src/codemirror/doc/upgrade_v4.html b/src/assets/plugins/codemirror/doc/upgrade_v4.html
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/doc/upgrade_v4.html
rename to src/assets/plugins/codemirror/doc/upgrade_v4.html
diff --git a/src/codemirror/doc/yinyang.png b/src/assets/plugins/codemirror/doc/yinyang.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/doc/yinyang.png
rename to src/assets/plugins/codemirror/doc/yinyang.png
diff --git a/src/codemirror/index.html b/src/assets/plugins/codemirror/index.html
old mode 100755
new mode 100644
similarity index 69%
rename from src/codemirror/index.html
rename to src/assets/plugins/codemirror/index.html
index 4e4f164..59cac74
--- a/src/codemirror/index.html
+++ b/src/assets/plugins/codemirror/index.html
@@ -99,7 +99,7 @@
![CodePen](data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 138 26"><path fill="none" stroke="black" stroke-width="2.3" stroke-linecap="round" stroke-linejoin="round" d="M15 8a7 7 0 100 10m7-8.7L33 2l11 7.3v7.4L33 24l-11-7.3zm0 0l11 7.4 11-7.4m0 7.4L33 9.3l-11 7.4M33 2v7.3m0 7.4V24M52 6h5a7 7 0 010 14h-5zm28 0h-9v14h9m-9-7h6m11 1h6a4 4 0 000-8h-6v14m26-14h-9v14h9m-9-7h6m11 7V6l11 14V6"/></svg>)
+ ' d='M81.3,57.6L18.7,3.1c-1.9-1.8-4.5-3-7.3-3.1C5.2-0.2,0.2,4.6,0,10.7c-0.1,4.3,2.3,8.1,5.8,10l70.4,43.7c0.1,0.1,0.2,0.1,0.3,0.2c2.1,1.1,4.6,0.4,5.8-1.6C83.4,61.2,82.9,58.9,81.3,57.6z'/%3E%3ClinearGradient id='SVGID_2_' gradientUnits='userSpaceOnUse' x1='28.3538' y1='119.6551' x2='139.5938' y2='60.2551'%3E%3Cstop offset='0' stop-color='%23FFE42E'/%3E%3Cstop offset='1' stop-color='%23ED417C'/%3E%3C/linearGradient%3E%3Cpath fill='url(%23SVGID_2_)' d='M142.7,66.3c-0.3-8.6-7.6-15.3-16.2-14.9c-2.7,0.1-5.3,0.9-7.5,2.2l-88,50.1c0,0-0.1,0-0.1,0.1c-3,1.2-5,4.2-4.9,7.6c0.2,4.4,3.8,7.8,8.2,7.6c1,0,2-0.3,2.9-0.7l95.9-37c0,0,0.1,0,0.2-0.1C138.9,78.8,142.9,73,142.7,66.3z'/%3E%3ClinearGradient id='SVGID_3_' gradientUnits='userSpaceOnUse' x1='31.6974' y1='114.3816' x2='72.0174' y2='55.3416'%3E%3Cstop offset='0' stop-color='%23FFE42E'/%3E%3Cstop offset='1' stop-color='%23F05922'/%3E%3C/linearGradient%3E%3Cpath fill='url(%23SVGID_3_)' d='M71.8,64c1.1-2.1,0.3-4.7-1.8-5.7c-1.9-1-4.2-0.4-5.4,1.3l-37.1,47.1c0,0,0,0.1-0.1,0.2c-1.8,2.7-1.8,6.3,0.3,9c2.6,3.5,7.5,4.2,11,1.7c1-0.8,1.8-1.8,2.4-2.8l30.5-50.2C71.6,64.3,71.7,64.1,71.8,64z'/%3E%3Crect x='45.5' y='35.7' width='51' height='51'/%3E%3Crect x='49.9' y='77.1' fill='%23fff' width='19.1' height='3.2'/%3E%3Cpath fill='%23fff' d='M49.7,49.1l1.5-1.4c0.4,0.5,0.8,0.8,1.3,0.8c0.6,0,0.9-0.4,0.9-1.2V42h2.3v5.3c0,1-0.3,1.8-0.8,2.3c-0.5,0.5-1.3,0.8-2.3,0.8C51.2,50.5,50.3,49.9,49.7,49.1z'/%3E%3Cpath fill='%23fff' d='M56.3,42h6.7V44h-4.4v1.3h4v1.8h-4v1.3H63v2h-6.7V42z'/%3E%3Cpath fill='%23fff' d='M66,44.1h-2.5v-2h7.3v2h-2.5v6.3H66V44.1z'/%3E%3Cpath fill='%23fff' d='M49.9,52.3h4.3c1,0,1.8,0.3,2.3,0.7c0.3,0.3,0.5,0.8,0.5,1.4v0c0,1-0.5,1.5-1.3,1.9c1,0.3,1.7,0.9,1.7,2v0c0,1.4-1.2,2.3-3.1,2.3h-4.3V52.3z M54.7,54.9c0-0.5-0.4-0.7-1-0.7h-1.5v1.5h1.4C54.3,55.6,54.7,55.4,54.7,54.9L54.7,54.9z M53.9,57.2h-1.8v1.5h1.8c0.7,0,1.1-0.3,1.1-0.8v0C55,57.5,54.7,57.2,53.9,57.2z'/%3E%3Cpath fill='%23fff' d='M57.7,52.3h3.9c1.3,0,2.2,0.3,2.7,0.9c0.5,0.5,0.7,1.1,0.7,1.9v0c0,1.3-0.7,2.1-1.7,2.6l2,2.9h-2.6L61,58.1h-1v2.5h-2.3V52.3z M61.5,56.3c0.8,0,1.2-0.4,1.2-1v0c0-0.7-0.5-1-1.2-1H60v2H61.5z'/%3E%3Cpath fill='%23fff' d='M67.8,52.2H70l3.5,8.4h-2.5l-0.6-1.5h-3.2l-0.6,1.5h-2.4L67.8,52.2z M69.8,57.3L68.9,55l-0.9,2.4H69.8z'/%3E%3Cpath fill='%23fff' d='M73.8,52.3h2.3v8.3h-2.3V52.3z'/%3E%3Cpath fill='%23fff' d='M76.7,52.3h2.2l3.4,4.4v-4.4h2.3v8.3h-2L79,56.1v4.6h-2.3V52.3z'/%3E%3Cpath fill='%23fff' d='M84.7,59.4l1.3-1.5c0.8,0.7,1.7,1,2.7,1c0.6,0,1-0.2,1-0.6v0c0-0.4-0.3-0.5-1.4-0.8c-1.8-0.4-3.1-0.9-3.1-2.6v0c0-1.5,1.2-2.7,3.2-2.7c1.4,0,2.5,0.4,3.4,1.1l-1.2,1.6c-0.8-0.5-1.6-0.8-2.3-0.8c-0.6,0-0.8,0.2-0.8,0.5v0c0,0.4,0.3,0.5,1.4,0.8c1.9,0.4,3.1,1,3.1,2.6v0c0,1.7-1.3,2.7-3.4,2.7C87.1,60.8,85.7,60.3,84.7,59.4z'/%3E%3C/svg%3E%0A)
+ - Home
diff --git a/src/codemirror/mode/htmlmixed/htmlmixed.js b/src/assets/plugins/codemirror/mode/htmlmixed/htmlmixed.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/htmlmixed/htmlmixed.js
rename to src/assets/plugins/codemirror/mode/htmlmixed/htmlmixed.js
diff --git a/src/codemirror/mode/htmlmixed/index.html b/src/assets/plugins/codemirror/mode/htmlmixed/index.html
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/htmlmixed/index.html
rename to src/assets/plugins/codemirror/mode/htmlmixed/index.html
diff --git a/src/codemirror/mode/index.html b/src/assets/plugins/codemirror/mode/index.html
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/index.html
rename to src/assets/plugins/codemirror/mode/index.html
diff --git a/src/codemirror/mode/javascript/index.html b/src/assets/plugins/codemirror/mode/javascript/index.html
old mode 100755
new mode 100644
similarity index 99%
rename from src/codemirror/mode/javascript/index.html
rename to src/assets/plugins/codemirror/mode/javascript/index.html
index 4eff2e2..d1f7f68
--- a/src/codemirror/mode/javascript/index.html
+++ b/src/assets/plugins/codemirror/mode/javascript/index.html
@@ -12,7 +12,7 @@
-
CodeMirror
+ CodeMirror
- Home
diff --git a/src/codemirror/mode/javascript/javascript.js b/src/assets/plugins/codemirror/mode/javascript/javascript.js
old mode 100755
new mode 100644
similarity index 96%
rename from src/codemirror/mode/javascript/javascript.js
rename to src/assets/plugins/codemirror/mode/javascript/javascript.js
index 0f83664..c657763
--- a/src/codemirror/mode/javascript/javascript.js
+++ b/src/assets/plugins/codemirror/mode/javascript/javascript.js
@@ -67,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");
@@ -75,10 +75,10 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
return ret(ch);
} else if (ch == "=" && stream.eat(">")) {
return ret("=>", "operator");
- } else if (ch == "0" && stream.match(/^(?:x[\da-f]+|o[0-7]+|b[01]+)n?/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*(?:n|(?:\.\d*)?(?:[eE][+\-]?\d+)?)?/);
+ stream.match(/^[\d_]*(?:n|(?:\.[\d_]*)?(?:[eE][+\-]?[\d_]+)?)?/);
return ret("number", "number");
} else if (ch == "/") {
if (stream.eat("*")) {
@@ -98,9 +98,14 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
} else if (ch == "`") {
state.tokenize = tokenQuasi;
return tokenQuasi(stream, state);
- } else if (ch == "#") {
+ } else if (ch == "#" && stream.peek() == "!") {
stream.skipToEnd();
- return ret("error", "error");
+ return ret("meta", "meta");
+ } else if (ch == "#" && stream.eatWhile(wordRE)) {
+ return ret("variable", "property")
+ } else if (ch == "<" && stream.match("!--") || ch == "-" && stream.match("->")) {
+ stream.skipToEnd()
+ return ret("comment", "comment")
} else if (isOperatorChar.test(ch)) {
if (ch != ">" || !state.lexical || state.lexical.type != ">") {
if (stream.eat("=")) {
@@ -110,6 +115,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
if (ch == ">") stream.eat(ch)
}
}
+ if (ch == "?" && stream.eat(".")) return ret(".")
return ret("operator", "operator", stream.current());
} else if (wordRE.test(ch)) {
stream.eatWhile(wordRE);
@@ -195,8 +201,12 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
++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;
@@ -410,7 +420,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
}
function parenExpr(type) {
if (type != "(") return pass()
- return cont(pushlex(")"), expression, expect(")"), poplex)
+ return cont(pushlex(")"), maybeexpression, expect(")"), poplex)
}
function expressionInner(type, value, noComma) {
if (cx.state.fatArrowAt == cx.stream.start) {
@@ -439,7 +449,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
}
function maybeoperatorComma(type, value) {
- if (type == ",") return cont(expression);
+ if (type == ",") return cont(maybeexpression);
return maybeoperatorNoComma(type, value, false);
}
function maybeoperatorNoComma(type, value, noComma) {
@@ -448,7 +458,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
if (type == "=>") return cont(pushcontext, noComma ? arrowBodyNoComma : arrowBody, popcontext);
if (type == "operator") {
if (/\+\+|--/.test(value) || isTS && value == "!") return cont(me);
- if (isTS && value == "<" && cx.stream.match(/^([^>]|<.*?>)*>\s*\(/, false))
+ 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);
@@ -574,10 +584,13 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
}
function maybetype(type, value) {
if (isTS) {
- if (type == ":" || value == "in") return cont(typeexpr);
+ if (type == ":") return cont(typeexpr);
if (value == "?") return cont(maybetype);
}
}
+ function maybetypeOrIn(type, value) {
+ if (isTS && (type == ":" || value == "in")) return cont(typeexpr)
+ }
function mayberettype(type) {
if (isTS && type == ":") {
if (cx.stream.match(/^\s*\w+\s+is\b/, false)) return cont(expression, isKW, typeexpr)
@@ -618,7 +631,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
} else if (type == ":") {
return cont(typeexpr)
} else if (type == "[") {
- return cont(expect("variable"), maybetype, expect("]"), typeprop)
+ return cont(expect("variable"), maybetypeOrIn, expect("]"), typeprop)
} else if (type == "(") {
return pass(functiondecl, typeprop)
}
@@ -747,11 +760,11 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
}
if (type == "variable" || cx.style == "keyword") {
cx.marked = "property";
- return cont(isTS ? classfield : functiondef, classBody);
+ return cont(classfield, classBody);
}
- if (type == "number" || type == "string") return cont(isTS ? classfield : functiondef, classBody);
+ if (type == "number" || type == "string") return cont(classfield, classBody);
if (type == "[")
- return cont(expression, maybetype, expect("]"), isTS ? classfield : functiondef, classBody)
+ return cont(expression, maybetype, expect("]"), classfield, classBody)
if (value == "*") {
cx.marked = "keyword";
return cont(classBody);
diff --git a/src/codemirror/mode/javascript/json-ld.html b/src/assets/plugins/codemirror/mode/javascript/json-ld.html
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/javascript/json-ld.html
rename to src/assets/plugins/codemirror/mode/javascript/json-ld.html
diff --git a/src/codemirror/mode/javascript/test.js b/src/assets/plugins/codemirror/mode/javascript/test.js
old mode 100755
new mode 100644
similarity index 95%
rename from src/codemirror/mode/javascript/test.js
rename to src/assets/plugins/codemirror/mode/javascript/test.js
index 04faeaf..ffff05f
--- a/src/codemirror/mode/javascript/test.js
+++ b/src/assets/plugins/codemirror/mode/javascript/test.js
@@ -127,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]);",
@@ -298,6 +301,30 @@
"[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];")
+
+ MT("private properties",
+ "[keyword class] [def C] {",
+ " [property #x] [operator =] [number 2];",
+ " [property #read]() {",
+ " [keyword return] [keyword this].[property #x]",
+ " }",
+ "}")
+
var ts_mode = CodeMirror.getMode({indentUnit: 2}, "application/typescript")
function TS(name) {
test.mode(name, ts_mode, Array.prototype.slice.call(arguments, 1))
diff --git a/src/codemirror/mode/javascript/typescript.html b/src/assets/plugins/codemirror/mode/javascript/typescript.html
old mode 100755
new mode 100644
similarity index 97%
rename from src/codemirror/mode/javascript/typescript.html
rename to src/assets/plugins/codemirror/mode/javascript/typescript.html
index 3b217a4..7da84d2
--- a/src/codemirror/mode/javascript/typescript.html
+++ b/src/assets/plugins/codemirror/mode/javascript/typescript.html
@@ -10,7 +10,7 @@
-
CodeMirror
+ CodeMirror
- Home
diff --git a/src/codemirror/mode/lua/index.html b/src/assets/plugins/codemirror/mode/lua/index.html
old mode 100755
new mode 100644
similarity index 98%
rename from src/codemirror/mode/lua/index.html
rename to src/assets/plugins/codemirror/mode/lua/index.html
index 59f4df3..05c9446
--- a/src/codemirror/mode/lua/index.html
+++ b/src/assets/plugins/codemirror/mode/lua/index.html
@@ -11,7 +11,7 @@
-
CodeMirror
+ CodeMirror
- Home
diff --git a/src/codemirror/mode/lua/lua.js b/src/assets/plugins/codemirror/mode/lua/lua.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/lua/lua.js
rename to src/assets/plugins/codemirror/mode/lua/lua.js
diff --git a/src/codemirror/mode/meta.js b/src/assets/plugins/codemirror/mode/meta.js
old mode 100755
new mode 100644
similarity index 97%
rename from src/codemirror/mode/meta.js
rename to src/assets/plugins/codemirror/mode/meta.js
index ef0a26a..9f64f41
--- a/src/codemirror/mode/meta.js
+++ b/src/assets/plugins/codemirror/mode/meta.js
@@ -20,7 +20,7 @@
{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"]},
@@ -84,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"},
@@ -94,7 +94,8 @@
{name: "NSIS", mime: "text/x-nsis", mode: "nsis", ext: ["nsh", "nsi"]},
{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: "Objective-C", mime: "text/x-objectivec", mode: "clike", ext: ["m"], alias: ["objective-c", "objc"]},
+ {name: "Objective-C++", mime: "text/x-objectivec++", mode: "clike", ext: ["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"]},
@@ -105,6 +106,7 @@
{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"]},
@@ -142,7 +144,7 @@
{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"},
+ {name: "TiddlyWiki", mime: "text/x-tiddlywiki", mode: "tiddlywiki"},
{name: "Tiki wiki", mime: "text/tiki", mode: "tiki"},
{name: "TOML", mime: "text/x-toml", mode: "toml", ext: ["toml"]},
{name: "Tornado", mime: "text/x-tornado", mode: "tornado"},
@@ -188,6 +190,7 @@
};
CodeMirror.findModeByExtension = function(ext) {
+ ext = ext.toLowerCase();
for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
var info = CodeMirror.modeInfo[i];
if (info.ext) for (var j = 0; j < info.ext.length; j++)
diff --git a/src/codemirror/mode/perl/index.html b/src/assets/plugins/codemirror/mode/perl/index.html
old mode 100755
new mode 100644
similarity index 97%
rename from src/codemirror/mode/perl/index.html
rename to src/assets/plugins/codemirror/mode/perl/index.html
index 901718a..b879b33
--- a/src/codemirror/mode/perl/index.html
+++ b/src/assets/plugins/codemirror/mode/perl/index.html
@@ -9,7 +9,7 @@
-
CodeMirror
+ CodeMirror
- Home
diff --git a/src/codemirror/mode/perl/perl.js b/src/assets/plugins/codemirror/mode/perl/perl.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/perl/perl.js
rename to src/assets/plugins/codemirror/mode/perl/perl.js
diff --git a/src/codemirror/mode/php/index.html b/src/assets/plugins/codemirror/mode/php/index.html
old mode 100755
new mode 100644
similarity index 97%
rename from src/codemirror/mode/php/index.html
rename to src/assets/plugins/codemirror/mode/php/index.html
index 6897641..0de6ae6
--- a/src/codemirror/mode/php/index.html
+++ b/src/assets/plugins/codemirror/mode/php/index.html
@@ -15,7 +15,7 @@
-
CodeMirror
+ CodeMirror
- Home
diff --git a/src/codemirror/mode/php/php.js b/src/assets/plugins/codemirror/mode/php/php.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/php/php.js
rename to src/assets/plugins/codemirror/mode/php/php.js
diff --git a/src/codemirror/mode/php/test.js b/src/assets/plugins/codemirror/mode/php/test.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/php/test.js
rename to src/assets/plugins/codemirror/mode/php/test.js
diff --git a/src/codemirror/mode/powershell/index.html b/src/assets/plugins/codemirror/mode/powershell/index.html
old mode 100755
new mode 100644
similarity index 99%
rename from src/codemirror/mode/powershell/index.html
rename to src/assets/plugins/codemirror/mode/powershell/index.html
index 6bb7bab..fae0298
--- a/src/codemirror/mode/powershell/index.html
+++ b/src/assets/plugins/codemirror/mode/powershell/index.html
@@ -28,6 +28,10 @@
PowerShell mode
+ + + +MIME types defined:
+ diff --git a/src/assets/plugins/codemirror/mode/rust/rust.js b/src/assets/plugins/codemirror/mode/rust/rust.js new file mode 100644 index 0000000..f95f320 --- /dev/null +++ b/src/assets/plugins/codemirror/mode/rust/rust.js @@ -0,0 +1,72 @@ +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: https://codemirror.net/LICENSE + +(function(mod) { + if (typeof exports == "object" && typeof module == "object") // CommonJS + mod(require("../../lib/codemirror"), require("../../addon/mode/simple")); + else if (typeof define == "function" && define.amd) // AMD + define(["../../lib/codemirror", "../../addon/mode/simple"], mod); + else // Plain browser env + mod(CodeMirror); +})(function(CodeMirror) { +"use strict"; + +CodeMirror.defineSimpleMode("rust",{ + start: [ + // string and byte string + {regex: /b?"/, token: "string", next: "string"}, + // raw string and raw byte string + {regex: /b?r"/, token: "string", next: "string_raw"}, + {regex: /b?r#+"/, token: "string", next: "string_raw_hash"}, + // character + {regex: /'(?:[^'\\]|\\(?:[nrt0'"]|x[\da-fA-F]{2}|u\{[\da-fA-F]{6}\}))'/, token: "string-2"}, + // byte + {regex: /b'(?:[^']|\\(?:['\\nrt0]|x[\da-fA-F]{2}))'/, token: "string-2"}, + + {regex: /(?:(?:[0-9][0-9_]*)(?:(?:[Ee][+-]?[0-9_]+)|\.[0-9_]+(?:[Ee][+-]?[0-9_]+)?)(?:f32|f64)?)|(?:0(?:b[01_]+|(?:o[0-7_]+)|(?:x[0-9a-fA-F_]+))|(?:[0-9][0-9_]*))(?:u8|u16|u32|u64|i8|i16|i32|i64|isize|usize)?/, + token: "number"}, + {regex: /(let(?:\s+mut)?|fn|enum|mod|struct|type|union)(\s+)([a-zA-Z_][a-zA-Z0-9_]*)/, token: ["keyword", null, "def"]}, + {regex: /(?:abstract|alignof|as|async|await|box|break|continue|const|crate|do|dyn|else|enum|extern|fn|for|final|if|impl|in|loop|macro|match|mod|move|offsetof|override|priv|proc|pub|pure|ref|return|self|sizeof|static|struct|super|trait|type|typeof|union|unsafe|unsized|use|virtual|where|while|yield)\b/, token: "keyword"}, + {regex: /\b(?:Self|isize|usize|char|bool|u8|u16|u32|u64|f16|f32|f64|i8|i16|i32|i64|str|Option)\b/, token: "atom"}, + {regex: /\b(?:true|false|Some|None|Ok|Err)\b/, token: "builtin"}, + {regex: /\b(fn)(\s+)([a-zA-Z_][a-zA-Z0-9_]*)/, + token: ["keyword", null ,"def"]}, + {regex: /#!?\[.*\]/, token: "meta"}, + {regex: /\/\/.*/, token: "comment"}, + {regex: /\/\*/, token: "comment", next: "comment"}, + {regex: /[-+\/*=<>!]+/, token: "operator"}, + {regex: /[a-zA-Z_]\w*!/,token: "variable-3"}, + {regex: /[a-zA-Z_]\w*/, token: "variable"}, + {regex: /[\{\[\(]/, indent: true}, + {regex: /[\}\]\)]/, dedent: true} + ], + string: [ + {regex: /"/, token: "string", next: "start"}, + {regex: /(?:[^\\"]|\\(?:.|$))*/, token: "string"} + ], + string_raw: [ + {regex: /"/, token: "string", next: "start"}, + {regex: /[^"]*/, token: "string"} + ], + string_raw_hash: [ + {regex: /"#+/, token: "string", next: "start"}, + {regex: /(?:[^"]|"(?!#))*/, token: "string"} + ], + comment: [ + {regex: /.*?\*\//, token: "comment", next: "start"}, + {regex: /.*/, token: "comment"} + ], + meta: { + dontIndentStates: ["comment"], + electricInput: /^\s*\}$/, + blockCommentStart: "/*", + blockCommentEnd: "*/", + lineComment: "//", + fold: "brace" + } +}); + + +CodeMirror.defineMIME("text/x-rustsrc", "rust"); +CodeMirror.defineMIME("text/rust", "rust"); +}); diff --git a/src/assets/plugins/codemirror/mode/rust/test.js b/src/assets/plugins/codemirror/mode/rust/test.js new file mode 100644 index 0000000..36c5cde --- /dev/null +++ b/src/assets/plugins/codemirror/mode/rust/test.js @@ -0,0 +1,39 @@ +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: https://codemirror.net/LICENSE + +(function() { + var mode = CodeMirror.getMode({indentUnit: 4}, "rust"); + function MT(name) {test.mode(name, mode, Array.prototype.slice.call(arguments, 1));} + + MT('integer_test', + '[number 123i32]', + '[number 123u32]', + '[number 123_u32]', + '[number 0xff_u8]', + '[number 0o70_i16]', + '[number 0b1111_1111_1001_0000_i32]', + '[number 0usize]'); + + MT('float_test', + '[number 123.0f64]', + '[number 0.1f64]', + '[number 0.1f32]', + '[number 12E+99_f64]'); + + MT('string-literals-test', + '[string "foo"]', + '[string r"foo"]', + '[string "\\"foo\\""]', + '[string r#""foo""#]', + '[string "foo #\\"# bar"]', + + '[string b"foo"]', + '[string br"foo"]', + '[string b"\\"foo\\""]', + '[string br#""foo""#]', + '[string br##"foo #" bar"##]', + + "[string-2 'h']", + "[string-2 b'h']"); + +})(); diff --git a/src/codemirror/mode/shell/index.html b/src/assets/plugins/codemirror/mode/shell/index.html old mode 100755 new mode 100644 similarity index 97% rename from src/codemirror/mode/shell/index.html rename to src/assets/plugins/codemirror/mode/shell/index.html index a844c1a..6aed459 --- a/src/codemirror/mode/shell/index.html +++ b/src/assets/plugins/codemirror/mode/shell/index.html @@ -12,7 +12,7 @@ .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}text/x-rustsrc.-CodeMirror
+ CodeMirror
- Home
diff --git a/src/codemirror/mode/shell/shell.js b/src/assets/plugins/codemirror/mode/shell/shell.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/shell/shell.js
rename to src/assets/plugins/codemirror/mode/shell/shell.js
diff --git a/src/codemirror/mode/shell/test.js b/src/assets/plugins/codemirror/mode/shell/test.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/shell/test.js
rename to src/assets/plugins/codemirror/mode/shell/test.js
diff --git a/src/codemirror/mode/xml/index.html b/src/assets/plugins/codemirror/mode/xml/index.html
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/xml/index.html
rename to src/assets/plugins/codemirror/mode/xml/index.html
diff --git a/src/codemirror/mode/xml/test.js b/src/assets/plugins/codemirror/mode/xml/test.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/xml/test.js
rename to src/assets/plugins/codemirror/mode/xml/test.js
diff --git a/src/codemirror/mode/xml/xml.js b/src/assets/plugins/codemirror/mode/xml/xml.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/xml/xml.js
rename to src/assets/plugins/codemirror/mode/xml/xml.js
diff --git a/src/codemirror/package.json b/src/assets/plugins/codemirror/package.json
old mode 100755
new mode 100644
similarity index 84%
rename from src/codemirror/package.json
rename to src/assets/plugins/codemirror/package.json
index 3330694..7956d37
--- a/src/codemirror/package.json
+++ b/src/assets/plugins/codemirror/package.json
@@ -1,6 +1,6 @@
{
"name": "codemirror",
- "version": "5.46.0",
+ "version": "5.54.0",
"main": "lib/codemirror.js",
"style": "lib/codemirror.css",
"author": {
@@ -21,12 +21,11 @@
"lint": "bin/lint"
},
"devDependencies": {
- "blint": "^1",
+ "blint": "^1.1.0",
"node-static": "0.7.11",
- "phantomjs-prebuilt": "^2.1.12",
- "rollup": "^0.66.2",
- "rollup-plugin-buble": "^0.19.2",
- "rollup-watch": "^4.3.1"
+ "puppeteer": "^1.20.0",
+ "rollup": "^1.26.3",
+ "rollup-plugin-buble": "^0.19.8"
},
"bugs": "http://github.com/codemirror/CodeMirror/issues",
"keywords": [
diff --git a/src/codemirror/rollup.config.js b/src/assets/plugins/codemirror/rollup.config.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/rollup.config.js
rename to src/assets/plugins/codemirror/rollup.config.js
diff --git a/src/codemirror/src/codemirror.js b/src/assets/plugins/codemirror/src/codemirror.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/codemirror.js
rename to src/assets/plugins/codemirror/src/codemirror.js
diff --git a/src/codemirror/src/display/Display.js b/src/assets/plugins/codemirror/src/display/Display.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/display/Display.js
rename to src/assets/plugins/codemirror/src/display/Display.js
diff --git a/src/codemirror/src/display/focus.js b/src/assets/plugins/codemirror/src/display/focus.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/display/focus.js
rename to src/assets/plugins/codemirror/src/display/focus.js
diff --git a/src/codemirror/src/display/gutters.js b/src/assets/plugins/codemirror/src/display/gutters.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/display/gutters.js
rename to src/assets/plugins/codemirror/src/display/gutters.js
diff --git a/src/codemirror/src/display/highlight_worker.js b/src/assets/plugins/codemirror/src/display/highlight_worker.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/display/highlight_worker.js
rename to src/assets/plugins/codemirror/src/display/highlight_worker.js
diff --git a/src/codemirror/src/display/line_numbers.js b/src/assets/plugins/codemirror/src/display/line_numbers.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/display/line_numbers.js
rename to src/assets/plugins/codemirror/src/display/line_numbers.js
diff --git a/src/codemirror/src/display/mode_state.js b/src/assets/plugins/codemirror/src/display/mode_state.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/display/mode_state.js
rename to src/assets/plugins/codemirror/src/display/mode_state.js
diff --git a/src/codemirror/src/display/operations.js b/src/assets/plugins/codemirror/src/display/operations.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/display/operations.js
rename to src/assets/plugins/codemirror/src/display/operations.js
diff --git a/src/codemirror/src/display/scroll_events.js b/src/assets/plugins/codemirror/src/display/scroll_events.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/display/scroll_events.js
rename to src/assets/plugins/codemirror/src/display/scroll_events.js
diff --git a/src/codemirror/src/display/scrollbars.js b/src/assets/plugins/codemirror/src/display/scrollbars.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/display/scrollbars.js
rename to src/assets/plugins/codemirror/src/display/scrollbars.js
diff --git a/src/codemirror/src/display/scrolling.js b/src/assets/plugins/codemirror/src/display/scrolling.js
old mode 100755
new mode 100644
similarity index 97%
rename from src/codemirror/src/display/scrolling.js
rename to src/assets/plugins/codemirror/src/display/scrolling.js
index 26ec993..6d97247
--- a/src/codemirror/src/display/scrolling.js
+++ b/src/assets/plugins/codemirror/src/display/scrolling.js
@@ -165,7 +165,7 @@ export function updateScrollTop(cm, val) {
}
export function setScrollTop(cm, val, forceScroll) {
- val = Math.min(cm.display.scroller.scrollHeight - cm.display.scroller.clientHeight, val)
+ val = Math.max(0, Math.min(cm.display.scroller.scrollHeight - cm.display.scroller.clientHeight, val))
if (cm.display.scroller.scrollTop == val && !forceScroll) return
cm.doc.scrollTop = val
cm.display.scrollbars.setScrollTop(val)
@@ -175,7 +175,7 @@ export function setScrollTop(cm, val, forceScroll) {
// Sync scroller and scrollbar, ensure the gutter elements are
// aligned.
export function setScrollLeft(cm, val, isScroller, forceScroll) {
- val = Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth)
+ val = Math.max(0, Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth))
if ((isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) && !forceScroll) return
cm.doc.scrollLeft = val
alignHorizontally(cm)
diff --git a/src/codemirror/src/display/selection.js b/src/assets/plugins/codemirror/src/display/selection.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/display/selection.js
rename to src/assets/plugins/codemirror/src/display/selection.js
diff --git a/src/codemirror/src/display/update_display.js b/src/assets/plugins/codemirror/src/display/update_display.js
old mode 100755
new mode 100644
similarity index 97%
rename from src/codemirror/src/display/update_display.js
rename to src/assets/plugins/codemirror/src/display/update_display.js
index 20798f5..e6c21a0
--- a/src/codemirror/src/display/update_display.js
+++ b/src/assets/plugins/codemirror/src/display/update_display.js
@@ -74,7 +74,8 @@ function selectionSnapshot(cm) {
function restoreSelection(snapshot) {
if (!snapshot || !snapshot.activeElt || snapshot.activeElt == activeElt()) return
snapshot.activeElt.focus()
- if (snapshot.anchorNode && contains(document.body, snapshot.anchorNode) && contains(document.body, snapshot.focusNode)) {
+ if (!/^(INPUT|TEXTAREA)$/.test(snapshot.activeElt.nodeName) &&
+ snapshot.anchorNode && contains(document.body, snapshot.anchorNode) && contains(document.body, snapshot.focusNode)) {
let sel = window.getSelection(), range = document.createRange()
range.setEnd(snapshot.anchorNode, snapshot.anchorOffset)
range.collapse(false)
@@ -172,6 +173,8 @@ export function postUpdateDisplay(cm, update) {
update.visible = visibleLines(cm.display, cm.doc, viewport)
if (update.visible.from >= cm.display.viewFrom && update.visible.to <= cm.display.viewTo)
break
+ } else if (first) {
+ update.visible = visibleLines(cm.display, cm.doc, viewport)
}
if (!updateDisplayIfNeeded(cm, update)) break
updateHeightsInViewport(cm)
diff --git a/src/codemirror/src/display/update_line.js b/src/assets/plugins/codemirror/src/display/update_line.js
old mode 100755
new mode 100644
similarity index 96%
rename from src/codemirror/src/display/update_line.js
rename to src/assets/plugins/codemirror/src/display/update_line.js
index a436973..50d781e
--- a/src/codemirror/src/display/update_line.js
+++ b/src/assets/plugins/codemirror/src/display/update_line.js
@@ -1,7 +1,7 @@
import { buildLineContent } from "../line/line_data.js"
import { lineNumberFor } from "../line/utils_line.js"
import { ie, ie_version } from "../util/browser.js"
-import { elt } from "../util/dom.js"
+import { elt, classTest } from "../util/dom.js"
import { signalLater } from "../util/operation_group.js"
// When an aspect of a line changes, a string is added to
@@ -124,10 +124,10 @@ function updateLineGutter(cm, lineView, lineN, dims) {
function updateLineWidgets(cm, lineView, dims) {
if (lineView.alignable) lineView.alignable = null
+ let isWidget = classTest("CodeMirror-linewidget")
for (let node = lineView.node.firstChild, next; node; node = next) {
next = node.nextSibling
- if (node.className == "CodeMirror-linewidget")
- lineView.node.removeChild(node)
+ if (isWidget.test(node.className)) lineView.node.removeChild(node)
}
insertLineWidgets(cm, lineView, dims)
}
@@ -157,7 +157,7 @@ function insertLineWidgetsFor(cm, line, lineView, dims, allowAbove) {
if (!line.widgets) return
let wrap = ensureLineWrapped(lineView)
for (let i = 0, ws = line.widgets; i < ws.length; ++i) {
- let widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget")
+ let widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget" + (widget.className ? " " + widget.className : ""))
if (!widget.handleMouseEvents) node.setAttribute("cm-ignore-events", "true")
positionLineWidget(widget, node, lineView, dims)
cm.display.input.setUneditable(node)
diff --git a/src/codemirror/src/display/update_lines.js b/src/assets/plugins/codemirror/src/display/update_lines.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/display/update_lines.js
rename to src/assets/plugins/codemirror/src/display/update_lines.js
diff --git a/src/codemirror/src/display/view_tracking.js b/src/assets/plugins/codemirror/src/display/view_tracking.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/display/view_tracking.js
rename to src/assets/plugins/codemirror/src/display/view_tracking.js
diff --git a/src/codemirror/src/edit/CodeMirror.js b/src/assets/plugins/codemirror/src/edit/CodeMirror.js
old mode 100755
new mode 100644
similarity index 98%
rename from src/codemirror/src/edit/CodeMirror.js
rename to src/assets/plugins/codemirror/src/edit/CodeMirror.js
index 9188e1b..3429da1
--- a/src/codemirror/src/edit/CodeMirror.js
+++ b/src/assets/plugins/codemirror/src/edit/CodeMirror.js
@@ -120,6 +120,9 @@ function registerEventHandlers(cm) {
// which point we can't mess with it anymore. Context menu is
// handled in onMouseDown for these browsers.
on(d.scroller, "contextmenu", e => onContextMenu(cm, e))
+ on(d.input.getField(), "contextmenu", e => {
+ if (!d.scroller.contains(e.target)) onContextMenu(cm, e)
+ })
// Used to suppress mouse event handling when a touch happens
let touchFinished, prevTouch = {end: 0}
diff --git a/src/codemirror/src/edit/commands.js b/src/assets/plugins/codemirror/src/edit/commands.js
old mode 100755
new mode 100644
similarity index 99%
rename from src/codemirror/src/edit/commands.js
rename to src/assets/plugins/codemirror/src/edit/commands.js
index 3916b12..079379f
--- a/src/codemirror/src/edit/commands.js
+++ b/src/assets/plugins/codemirror/src/edit/commands.js
@@ -170,7 +170,7 @@ function lineStartSmart(cm, pos) {
let line = getLine(cm.doc, start.line)
let order = getOrder(line, cm.doc.direction)
if (!order || order[0].level == 0) {
- let firstNonWS = Math.max(0, line.text.search(/\S/))
+ let firstNonWS = Math.max(start.ch, line.text.search(/\S/))
let inWS = pos.line == start.line && pos.ch <= firstNonWS && pos.ch
return Pos(start.line, inWS ? 0 : firstNonWS, start.sticky)
}
diff --git a/src/codemirror/src/edit/deleteNearSelection.js b/src/assets/plugins/codemirror/src/edit/deleteNearSelection.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/edit/deleteNearSelection.js
rename to src/assets/plugins/codemirror/src/edit/deleteNearSelection.js
diff --git a/src/codemirror/src/edit/drop_events.js b/src/assets/plugins/codemirror/src/edit/drop_events.js
old mode 100755
new mode 100644
similarity index 83%
rename from src/codemirror/src/edit/drop_events.js
rename to src/assets/plugins/codemirror/src/edit/drop_events.js
index 12c760f..f309b2d
--- a/src/codemirror/src/edit/drop_events.js
+++ b/src/assets/plugins/codemirror/src/edit/drop_events.js
@@ -29,28 +29,39 @@ export function onDrop(e) {
// and insert it.
if (files && files.length && window.FileReader && window.File) {
let n = files.length, text = Array(n), read = 0
- let loadFile = (file, i) => {
- if (cm.options.allowDropFileTypes &&
- indexOf(cm.options.allowDropFileTypes, file.type) == -1)
- return
-
- let reader = new FileReader
- reader.onload = operation(cm, () => {
- let content = reader.result
- if (/[\x00-\x08\x0e-\x1f]{2}/.test(content)) content = ""
- text[i] = content
- if (++read == n) {
+ const markAsReadAndPasteIfAllFilesAreRead = () => {
+ if (++read == n) {
+ operation(cm, () => {
pos = clipPos(cm.doc, pos)
let change = {from: pos, to: pos,
- text: cm.doc.splitLines(text.join(cm.doc.lineSeparator())),
+ text: cm.doc.splitLines(
+ text.filter(t => t != null).join(cm.doc.lineSeparator())),
origin: "paste"}
makeChange(cm.doc, change)
- setSelectionReplaceHistory(cm.doc, simpleSelection(pos, changeEnd(change)))
+ setSelectionReplaceHistory(cm.doc, simpleSelection(clipPos(cm.doc, pos), clipPos(cm.doc, changeEnd(change))))
+ })()
+ }
+ }
+ const readTextFromFile = (file, i) => {
+ if (cm.options.allowDropFileTypes &&
+ indexOf(cm.options.allowDropFileTypes, file.type) == -1) {
+ markAsReadAndPasteIfAllFilesAreRead()
+ return
+ }
+ let reader = new FileReader
+ reader.onerror = () => markAsReadAndPasteIfAllFilesAreRead()
+ reader.onload = () => {
+ let content = reader.result
+ if (/[\x00-\x08\x0e-\x1f]{2}/.test(content)) {
+ markAsReadAndPasteIfAllFilesAreRead()
+ return
}
- })
+ text[i] = content
+ markAsReadAndPasteIfAllFilesAreRead()
+ }
reader.readAsText(file)
}
- for (let i = 0; i < n; ++i) loadFile(files[i], i)
+ for (let i = 0; i < files.length; i++) readTextFromFile(files[i], i)
} else { // Normal drop
// Don't do a replace if the drop happened inside of the selected text.
if (cm.state.draggingText && cm.doc.sel.contains(pos) > -1) {
diff --git a/src/codemirror/src/edit/fromTextArea.js b/src/assets/plugins/codemirror/src/edit/fromTextArea.js
old mode 100755
new mode 100644
similarity index 95%
rename from src/codemirror/src/edit/fromTextArea.js
rename to src/assets/plugins/codemirror/src/edit/fromTextArea.js
index 92498c1..35024c5
--- a/src/codemirror/src/edit/fromTextArea.js
+++ b/src/assets/plugins/codemirror/src/edit/fromTextArea.js
@@ -48,7 +48,7 @@ export function fromTextArea(textarea, options) {
textarea.style.display = ""
if (textarea.form) {
off(textarea.form, "submit", save)
- if (typeof textarea.form.submit == "function")
+ if (!options.leaveSubmitMethodAlone && typeof textarea.form.submit == "function")
textarea.form.submit = realSubmit
}
}
diff --git a/src/codemirror/src/edit/global_events.js b/src/assets/plugins/codemirror/src/edit/global_events.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/edit/global_events.js
rename to src/assets/plugins/codemirror/src/edit/global_events.js
diff --git a/src/codemirror/src/edit/key_events.js b/src/assets/plugins/codemirror/src/edit/key_events.js
old mode 100755
new mode 100644
similarity index 93%
rename from src/codemirror/src/edit/key_events.js
rename to src/assets/plugins/codemirror/src/edit/key_events.js
index f0521d0..8f72182
--- a/src/codemirror/src/edit/key_events.js
+++ b/src/assets/plugins/codemirror/src/edit/key_events.js
@@ -2,7 +2,7 @@ import { signalLater } from "../util/operation_group.js"
import { restartBlink } from "../display/selection.js"
import { isModifierKey, keyName, lookupKey } from "../input/keymap.js"
import { eventInWidget } from "../measurement/widgets.js"
-import { ie, ie_version, mac, presto } from "../util/browser.js"
+import { ie, ie_version, mac, presto, gecko } from "../util/browser.js"
import { activeElt, addClass, rmClass } from "../util/dom.js"
import { e_preventDefault, off, on, signalDOMEvent } from "../util/event.js"
import { hasCopyEvent } from "../util/feature_detection.js"
@@ -106,6 +106,7 @@ function handleCharBinding(cm, e, ch) {
let lastStoppedKey = null
export function onKeyDown(e) {
let cm = this
+ if (e.target && e.target != cm.display.input.getField()) return
cm.curOp.focus = activeElt()
if (signalDOMEvent(cm, e)) return
// IE does strange things with escape.
@@ -119,6 +120,8 @@ export function onKeyDown(e) {
if (!handled && code == 88 && !hasCopyEvent && (mac ? e.metaKey : e.ctrlKey))
cm.replaceSelection("", null, "cut")
}
+ if (gecko && !mac && !handled && code == 46 && e.shiftKey && !e.ctrlKey && document.execCommand)
+ document.execCommand("cut")
// Turn mouse into crosshair when Alt is held on Mac.
if (code == 18 && !/\bCodeMirror-crosshair\b/.test(cm.display.lineDiv.className))
@@ -147,6 +150,7 @@ export function onKeyUp(e) {
export function onKeyPress(e) {
let cm = this
+ if (e.target && e.target != cm.display.input.getField()) return
if (eventInWidget(cm.display, e) || signalDOMEvent(cm, e) || e.ctrlKey && !e.altKey || mac && e.metaKey) return
let keyCode = e.keyCode, charCode = e.charCode
if (presto && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return}
diff --git a/src/codemirror/src/edit/legacy.js b/src/assets/plugins/codemirror/src/edit/legacy.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/edit/legacy.js
rename to src/assets/plugins/codemirror/src/edit/legacy.js
diff --git a/src/codemirror/src/edit/main.js b/src/assets/plugins/codemirror/src/edit/main.js
old mode 100755
new mode 100644
similarity index 98%
rename from src/codemirror/src/edit/main.js
rename to src/assets/plugins/codemirror/src/edit/main.js
index b887f8c..e15243a
--- a/src/codemirror/src/edit/main.js
+++ b/src/assets/plugins/codemirror/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
addLegacyProps(CodeMirror)
-CodeMirror.version = "5.46.0"
+CodeMirror.version = "5.54.0"
diff --git a/src/codemirror/src/edit/methods.js b/src/assets/plugins/codemirror/src/edit/methods.js
old mode 100755
new mode 100644
similarity index 99%
rename from src/codemirror/src/edit/methods.js
rename to src/assets/plugins/codemirror/src/edit/methods.js
index e40012e..acf90d1
--- a/src/codemirror/src/edit/methods.js
+++ b/src/assets/plugins/codemirror/src/edit/methods.js
@@ -415,7 +415,7 @@ export default function(CodeMirror) {
clearCaches(this)
scrollToCoords(this, this.doc.scrollLeft, this.doc.scrollTop)
updateGutterSpace(this.display)
- if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5)
+ if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5 || this.options.lineWrapping)
estimateLineHeights(this)
signal(this, "refresh", this)
}),
@@ -469,8 +469,9 @@ function findPosH(doc, pos, dir, unit, visually) {
let oldPos = pos
let origDir = dir
let lineObj = getLine(doc, pos.line)
+ let lineDir = visually && doc.direction == "rtl" ? -dir : dir
function findNextLine() {
- let l = pos.line + dir
+ let l = pos.line + lineDir
if (l < doc.first || l >= doc.first + doc.size) return false
pos = new Pos(l, pos.ch, pos.sticky)
return lineObj = getLine(doc, l)
@@ -484,7 +485,7 @@ function findPosH(doc, pos, dir, unit, visually) {
}
if (next == null) {
if (!boundToLine && findNextLine())
- pos = endOfLine(visually, doc.cm, lineObj, pos.line, dir)
+ pos = endOfLine(visually, doc.cm, lineObj, pos.line, lineDir)
else
return false
} else {
diff --git a/src/codemirror/src/edit/mouse_events.js b/src/assets/plugins/codemirror/src/edit/mouse_events.js
old mode 100755
new mode 100644
similarity index 99%
rename from src/codemirror/src/edit/mouse_events.js
rename to src/assets/plugins/codemirror/src/edit/mouse_events.js
index d0bbfba..5fcc437
--- a/src/codemirror/src/edit/mouse_events.js
+++ b/src/assets/plugins/codemirror/src/edit/mouse_events.js
@@ -7,7 +7,7 @@ import { posFromMouse } from "../measurement/position_measurement.js"
import { eventInWidget } from "../measurement/widgets.js"
import { normalizeSelection, Range, Selection } from "../model/selection.js"
import { extendRange, extendSelection, replaceOneSelection, setSelection } from "../model/selection_updates.js"
-import { captureRightClick, chromeOS, ie, ie_version, mac, webkit } from "../util/browser.js"
+import { captureRightClick, chromeOS, ie, ie_version, mac, webkit, safari } from "../util/browser.js"
import { getOrder, getBidiPartAt } from "../util/bidi.js"
import { activeElt } from "../util/dom.js"
import { e_button, e_defaultPrevented, e_preventDefault, e_target, hasHandler, off, on, signal, signalDOMEvent } from "../util/event.js"
@@ -158,8 +158,8 @@ function leftButtonStartDrag(cm, event, pos, behavior) {
if (!behavior.addNew)
extendSelection(cm.doc, pos, null, null, behavior.extend)
// Work around unexplainable focus problem in IE9 (#2127) and Chrome (#3081)
- if (webkit || ie && ie_version == 9)
- setTimeout(() => {display.wrapper.ownerDocument.body.focus(); display.input.focus()}, 20)
+ if ((webkit && !safari) || ie && ie_version == 9)
+ setTimeout(() => {display.wrapper.ownerDocument.body.focus({preventScroll: true}); display.input.focus()}, 20)
else
display.input.focus()
}
diff --git a/src/codemirror/src/edit/options.js b/src/assets/plugins/codemirror/src/edit/options.js
old mode 100755
new mode 100644
similarity index 97%
rename from src/codemirror/src/edit/options.js
rename to src/assets/plugins/codemirror/src/edit/options.js
index ccca45d..225f549
--- a/src/codemirror/src/edit/options.js
+++ b/src/assets/plugins/codemirror/src/edit/options.js
@@ -68,7 +68,7 @@ export function defineOptions(CodeMirror) {
for (let 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-\u200f\u2028\u2029\ufeff]/g, (cm, val, old) => {
+ option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff\ufff9-\ufffc]/g, (cm, val, old) => {
cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g")
if (old != Init) cm.refresh()
})
@@ -132,6 +132,12 @@ export function defineOptions(CodeMirror) {
}
cm.display.input.readOnlyChanged(val)
})
+
+ option("screenReaderLabel", null, (cm, val) => {
+ val = (val === '') ? null : val
+ cm.display.input.screenReaderLabelChanged(val)
+ })
+
option("disableInput", false, (cm, val) => {if (!val) cm.display.input.reset()}, true)
option("dragDrop", true, dragDropChanged)
option("allowDropFileTypes", null)
diff --git a/src/codemirror/src/edit/utils.js b/src/assets/plugins/codemirror/src/edit/utils.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/edit/utils.js
rename to src/assets/plugins/codemirror/src/edit/utils.js
diff --git a/src/codemirror/src/input/ContentEditableInput.js b/src/assets/plugins/codemirror/src/input/ContentEditableInput.js
old mode 100755
new mode 100644
similarity index 96%
rename from src/codemirror/src/input/ContentEditableInput.js
rename to src/assets/plugins/codemirror/src/input/ContentEditableInput.js
index b77c7d4..b50073e
--- a/src/codemirror/src/input/ContentEditableInput.js
+++ b/src/assets/plugins/codemirror/src/input/ContentEditableInput.js
@@ -31,8 +31,16 @@ export default class ContentEditableInput {
let div = input.div = display.lineDiv
disableBrowserMagic(div, cm.options.spellcheck, cm.options.autocorrect, cm.options.autocapitalize)
+ function belongsToInput(e) {
+ for (let t = e.target; t; t = t.parentNode) {
+ if (t == div) return true
+ if (/\bCodeMirror-(?:line)?widget\b/.test(t.className)) break
+ }
+ return false
+ }
+
on(div, "paste", e => {
- if (signalDOMEvent(cm, e) || handlePaste(e, cm)) return
+ if (!belongsToInput(e) || signalDOMEvent(cm, e) || handlePaste(e, cm)) return
// IE doesn't fire input events, so we schedule a read for the pasted content in this way
if (ie_version <= 11) setTimeout(operation(cm, () => this.updateFromDOM()), 20)
})
@@ -57,7 +65,7 @@ export default class ContentEditableInput {
})
function onCopyCut(e) {
- if (signalDOMEvent(cm, e)) return
+ if (!belongsToInput(e) || signalDOMEvent(cm, e)) return
if (cm.somethingSelected()) {
setLastCopied({lineWise: false, text: cm.getSelections()})
if (e.type == "cut") cm.replaceSelection("", null, "cut")
@@ -99,9 +107,18 @@ export default class ContentEditableInput {
on(div, "cut", onCopyCut)
}
+ screenReaderLabelChanged(label) {
+ // Label for screenreaders, accessibility
+ if(label) {
+ this.div.setAttribute('aria-label', label)
+ } else {
+ this.div.removeAttribute('aria-label')
+ }
+ }
+
prepareSelection() {
let result = prepareSelection(this.cm, false)
- result.focus = this.cm.state.focused
+ result.focus = document.activeElement == this.div
return result
}
@@ -195,7 +212,7 @@ export default class ContentEditableInput {
focus() {
if (this.cm.options.readOnly != "nocursor") {
- if (!this.selectionInEditor())
+ if (!this.selectionInEditor() || document.activeElement != this.div)
this.showSelection(this.prepareSelection(), true)
this.div.focus()
}
diff --git a/src/codemirror/src/input/TextareaInput.js b/src/assets/plugins/codemirror/src/input/TextareaInput.js
old mode 100755
new mode 100644
similarity index 98%
rename from src/codemirror/src/input/TextareaInput.js
rename to src/assets/plugins/codemirror/src/input/TextareaInput.js
index ab02230..8fe14bb
--- a/src/codemirror/src/input/TextareaInput.js
+++ b/src/assets/plugins/codemirror/src/input/TextareaInput.js
@@ -118,6 +118,15 @@ export default class TextareaInput {
this.textarea = this.wrapper.firstChild
}
+ screenReaderLabelChanged(label) {
+ // Label for screenreaders, accessibility
+ if(label) {
+ this.textarea.setAttribute('aria-label', label)
+ } else {
+ this.textarea.removeAttribute('aria-label')
+ }
+ }
+
prepareSelection() {
// Redraw the selection and/or cursor
let cm = this.cm, display = cm.display, doc = cm.doc
diff --git a/src/codemirror/src/input/indent.js b/src/assets/plugins/codemirror/src/input/indent.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/input/indent.js
rename to src/assets/plugins/codemirror/src/input/indent.js
diff --git a/src/codemirror/src/input/input.js b/src/assets/plugins/codemirror/src/input/input.js
old mode 100755
new mode 100644
similarity index 99%
rename from src/codemirror/src/input/input.js
rename to src/assets/plugins/codemirror/src/input/input.js
index 26bba1d..8519ecf
--- a/src/codemirror/src/input/input.js
+++ b/src/assets/plugins/codemirror/src/input/input.js
@@ -132,4 +132,4 @@ export function hiddenTextarea() {
if (ios) te.style.border = "1px solid black"
disableBrowserMagic(te)
return div
-}
+}
\ No newline at end of file
diff --git a/src/codemirror/src/input/keymap.js b/src/assets/plugins/codemirror/src/input/keymap.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/input/keymap.js
rename to src/assets/plugins/codemirror/src/input/keymap.js
diff --git a/src/codemirror/src/input/keynames.js b/src/assets/plugins/codemirror/src/input/keynames.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/input/keynames.js
rename to src/assets/plugins/codemirror/src/input/keynames.js
diff --git a/src/codemirror/src/input/movement.js b/src/assets/plugins/codemirror/src/input/movement.js
old mode 100755
new mode 100644
similarity index 99%
rename from src/codemirror/src/input/movement.js
rename to src/assets/plugins/codemirror/src/input/movement.js
index 8d50fd2..479f221
--- a/src/codemirror/src/input/movement.js
+++ b/src/assets/plugins/codemirror/src/input/movement.js
@@ -15,6 +15,7 @@ export function moveLogically(line, start, dir) {
export function endOfLine(visually, cm, lineObj, lineNo, dir) {
if (visually) {
+ if (cm.doc.direction == "rtl") dir = -dir
let order = getOrder(lineObj, cm.doc.direction)
if (order) {
let part = dir < 0 ? lst(order) : order[0]
diff --git a/src/codemirror/src/line/highlight.js b/src/assets/plugins/codemirror/src/line/highlight.js
old mode 100755
new mode 100644
similarity index 99%
rename from src/codemirror/src/line/highlight.js
rename to src/assets/plugins/codemirror/src/line/highlight.js
index 9835d46..7b4ca0b
--- a/src/codemirror/src/line/highlight.js
+++ b/src/assets/plugins/codemirror/src/line/highlight.js
@@ -198,7 +198,7 @@ function extractLineClasses(type, output) {
let prop = lineClass[1] ? "bgClass" : "textClass"
if (output[prop] == null)
output[prop] = lineClass[2]
- else if (!(new RegExp("(?:^|\s)" + lineClass[2] + "(?:$|\s)")).test(output[prop]))
+ else if (!(new RegExp("(?:^|\\s)" + lineClass[2] + "(?:$|\\s)")).test(output[prop]))
output[prop] += " " + lineClass[2]
}
return type
diff --git a/src/codemirror/src/line/line_data.js b/src/assets/plugins/codemirror/src/line/line_data.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/line/line_data.js
rename to src/assets/plugins/codemirror/src/line/line_data.js
diff --git a/src/codemirror/src/line/pos.js b/src/assets/plugins/codemirror/src/line/pos.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/line/pos.js
rename to src/assets/plugins/codemirror/src/line/pos.js
diff --git a/src/codemirror/src/line/saw_special_spans.js b/src/assets/plugins/codemirror/src/line/saw_special_spans.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/line/saw_special_spans.js
rename to src/assets/plugins/codemirror/src/line/saw_special_spans.js
diff --git a/src/codemirror/src/line/spans.js b/src/assets/plugins/codemirror/src/line/spans.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/line/spans.js
rename to src/assets/plugins/codemirror/src/line/spans.js
diff --git a/src/codemirror/src/line/utils_line.js b/src/assets/plugins/codemirror/src/line/utils_line.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/line/utils_line.js
rename to src/assets/plugins/codemirror/src/line/utils_line.js
diff --git a/src/codemirror/src/measurement/position_measurement.js b/src/assets/plugins/codemirror/src/measurement/position_measurement.js
old mode 100755
new mode 100644
similarity index 98%
rename from src/codemirror/src/measurement/position_measurement.js
rename to src/assets/plugins/codemirror/src/measurement/position_measurement.js
index eb78287..bb0ad50
--- a/src/codemirror/src/measurement/position_measurement.js
+++ b/src/assets/plugins/codemirror/src/measurement/position_measurement.js
@@ -18,7 +18,7 @@ export function paddingTop(display) {return display.lineSpace.offsetTop}
export function paddingVert(display) {return display.mover.offsetHeight - display.lineSpace.offsetHeight}
export function paddingH(display) {
if (display.cachedPaddingH) return display.cachedPaddingH
- let e = removeChildrenAndAdd(display.measure, elt("pre", "x"))
+ let e = removeChildrenAndAdd(display.measure, elt("pre", "x", "CodeMirror-line-like"))
let style = window.getComputedStyle ? window.getComputedStyle(e) : e.currentStyle
let data = {left: parseInt(style.paddingLeft), right: parseInt(style.paddingRight)}
if (!isNaN(data.left) && !isNaN(data.right)) display.cachedPaddingH = data
@@ -412,7 +412,7 @@ export function estimateCoords(cm, pos) {
function PosWithInfo(line, ch, sticky, outside, xRel) {
let pos = Pos(line, ch, sticky)
pos.xRel = xRel
- if (outside) pos.outside = true
+ if (outside) pos.outside = outside
return pos
}
@@ -421,16 +421,16 @@ function PosWithInfo(line, ch, sticky, outside, xRel) {
export function coordsChar(cm, x, y) {
let doc = cm.doc
y += cm.display.viewOffset
- if (y < 0) return PosWithInfo(doc.first, 0, null, true, -1)
+ if (y < 0) return PosWithInfo(doc.first, 0, null, -1, -1)
let lineN = lineAtHeight(doc, y), last = doc.first + doc.size - 1
if (lineN > last)
- return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, null, true, 1)
+ return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, null, 1, 1)
if (x < 0) x = 0
let lineObj = getLine(doc, lineN)
for (;;) {
let found = coordsCharInner(cm, lineObj, lineN, x, y)
- let collapsed = collapsedSpanAround(lineObj, found.ch + (found.xRel > 0 ? 1 : 0))
+ let collapsed = collapsedSpanAround(lineObj, found.ch + (found.xRel > 0 || found.outside > 0 ? 1 : 0))
if (!collapsed) return found
let rangeEnd = collapsed.find(1)
if (rangeEnd.line == lineN) return rangeEnd
@@ -518,7 +518,7 @@ function coordsCharInner(cm, lineObj, lineNo, x, y) {
// base X position
let coords = cursorCoords(cm, Pos(lineNo, ch, sticky), "line", lineObj, preparedMeasure)
baseX = coords.left
- outside = y < coords.top || y >= coords.bottom
+ outside = y < coords.top ? -1 : y >= coords.bottom ? 1 : 0
}
ch = skipExtendingChars(lineObj.text, ch, 1)
@@ -585,7 +585,7 @@ let measureText
export function textHeight(display) {
if (display.cachedTextHeight != null) return display.cachedTextHeight
if (measureText == null) {
- measureText = elt("pre")
+ measureText = elt("pre", null, "CodeMirror-line-like")
// Measure a bunch of lines, for browsers that compute
// fractional heights.
for (let i = 0; i < 49; ++i) {
@@ -605,7 +605,7 @@ export function textHeight(display) {
export function charWidth(display) {
if (display.cachedCharWidth != null) return display.cachedCharWidth
let anchor = elt("span", "xxxxxxxxxx")
- let pre = elt("pre", [anchor])
+ let pre = elt("pre", [anchor], "CodeMirror-line-like")
removeChildrenAndAdd(display.measure, pre)
let rect = anchor.getBoundingClientRect(), width = (rect.right - rect.left) / 10
if (width > 2) display.cachedCharWidth = width
@@ -679,7 +679,7 @@ export function posFromMouse(cm, e, liberal, forRect) {
try { x = e.clientX - space.left; y = e.clientY - space.top }
catch (e) { return null }
let coords = coordsChar(cm, x, y), line
- if (forRect && coords.xRel == 1 && (line = getLine(cm.doc, coords.line).text).length == coords.ch) {
+ if (forRect && coords.xRel > 0 && (line = getLine(cm.doc, coords.line).text).length == coords.ch) {
let colDiff = countColumn(line, line.length, cm.options.tabSize) - line.length
coords = Pos(coords.line, Math.max(0, Math.round((x - paddingH(cm.display).left) / charWidth(cm.display)) - colDiff))
}
diff --git a/src/codemirror/src/measurement/widgets.js b/src/assets/plugins/codemirror/src/measurement/widgets.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/measurement/widgets.js
rename to src/assets/plugins/codemirror/src/measurement/widgets.js
diff --git a/src/codemirror/src/model/Doc.js b/src/assets/plugins/codemirror/src/model/Doc.js
old mode 100755
new mode 100644
similarity index 99%
rename from src/codemirror/src/model/Doc.js
rename to src/assets/plugins/codemirror/src/model/Doc.js
index 956f752..c305eee
--- a/src/codemirror/src/model/Doc.js
+++ b/src/assets/plugins/codemirror/src/model/Doc.js
@@ -197,7 +197,10 @@ Doc.prototype = createObj(BranchChunk.prototype, {
for (let i = 0; i < hist.undone.length; i++) if (!hist.undone[i].ranges) ++undone
return {undo: done, redo: undone}
},
- clearHistory: function() {this.history = new History(this.history.maxGeneration)},
+ clearHistory: function() {
+ this.history = new History(this.history.maxGeneration)
+ linkedDocs(this, doc => doc.history = this.history, true)
+ },
markClean: function() {
this.cleanGeneration = this.changeGeneration(true)
diff --git a/src/codemirror/src/model/change_measurement.js b/src/assets/plugins/codemirror/src/model/change_measurement.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/model/change_measurement.js
rename to src/assets/plugins/codemirror/src/model/change_measurement.js
diff --git a/src/codemirror/src/model/changes.js b/src/assets/plugins/codemirror/src/model/changes.js
old mode 100755
new mode 100644
similarity index 98%
rename from src/codemirror/src/model/changes.js
rename to src/assets/plugins/codemirror/src/model/changes.js
index 7a68883..48d2f6b
--- a/src/codemirror/src/model/changes.js
+++ b/src/assets/plugins/codemirror/src/model/changes.js
@@ -15,7 +15,7 @@ import { changeEnd, computeSelAfterChange } from "./change_measurement.js"
import { isWholeLineUpdate, linkedDocs, updateDoc } from "./document_data.js"
import { addChangeToHistory, historyChangeFromChange, mergeOldSpans, pushSelectionToHistory } from "./history.js"
import { Range, Selection } from "./selection.js"
-import { setSelection, setSelectionNoUndo } from "./selection_updates.js"
+import { setSelection, setSelectionNoUndo, skipAtomic } from "./selection_updates.js"
// UPDATING
@@ -202,6 +202,9 @@ function makeChangeSingleDoc(doc, change, selAfter, spans) {
if (doc.cm) makeChangeSingleDocInEditor(doc.cm, change, spans)
else updateDoc(doc, change, spans)
setSelectionNoUndo(doc, selAfter, sel_dontScroll)
+
+ if (doc.cantEdit && skipAtomic(doc, Pos(doc.firstLine(), 0)))
+ doc.cantEdit = false
}
// Handle the interaction of a change to a document with the editor
diff --git a/src/codemirror/src/model/chunk.js b/src/assets/plugins/codemirror/src/model/chunk.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/model/chunk.js
rename to src/assets/plugins/codemirror/src/model/chunk.js
diff --git a/src/codemirror/src/model/document_data.js b/src/assets/plugins/codemirror/src/model/document_data.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/model/document_data.js
rename to src/assets/plugins/codemirror/src/model/document_data.js
diff --git a/src/codemirror/src/model/history.js b/src/assets/plugins/codemirror/src/model/history.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/model/history.js
rename to src/assets/plugins/codemirror/src/model/history.js
diff --git a/src/codemirror/src/model/line_widget.js b/src/assets/plugins/codemirror/src/model/line_widget.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/model/line_widget.js
rename to src/assets/plugins/codemirror/src/model/line_widget.js
diff --git a/src/codemirror/src/model/mark_text.js b/src/assets/plugins/codemirror/src/model/mark_text.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/model/mark_text.js
rename to src/assets/plugins/codemirror/src/model/mark_text.js
diff --git a/src/codemirror/src/model/selection.js b/src/assets/plugins/codemirror/src/model/selection.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/model/selection.js
rename to src/assets/plugins/codemirror/src/model/selection.js
diff --git a/src/codemirror/src/model/selection_updates.js b/src/assets/plugins/codemirror/src/model/selection_updates.js
old mode 100755
new mode 100644
similarity index 91%
rename from src/codemirror/src/model/selection_updates.js
rename to src/assets/plugins/codemirror/src/model/selection_updates.js
index c9941b7..4db2bd7
--- a/src/codemirror/src/model/selection_updates.js
+++ b/src/assets/plugins/codemirror/src/model/selection_updates.js
@@ -150,8 +150,15 @@ function skipAtomicInner(doc, pos, oldPos, dir, mayClear) {
let line = getLine(doc, pos.line)
if (line.markedSpans) for (let i = 0; i < line.markedSpans.length; ++i) {
let sp = line.markedSpans[i], m = sp.marker
- if ((sp.from == null || (m.inclusiveLeft ? sp.from <= pos.ch : sp.from < pos.ch)) &&
- (sp.to == null || (m.inclusiveRight ? sp.to >= pos.ch : sp.to > pos.ch))) {
+
+ // Determine if we should prevent the cursor being placed to the left/right of an atomic marker
+ // Historically this was determined using the inclusiveLeft/Right option, but the new way to control it
+ // is with selectLeft/Right
+ let preventCursorLeft = ("selectLeft" in m) ? !m.selectLeft : m.inclusiveLeft
+ let preventCursorRight = ("selectRight" in m) ? !m.selectRight : m.inclusiveRight
+
+ if ((sp.from == null || (preventCursorLeft ? sp.from <= pos.ch : sp.from < pos.ch)) &&
+ (sp.to == null || (preventCursorRight ? sp.to >= pos.ch : sp.to > pos.ch))) {
if (mayClear) {
signal(m, "beforeCursorEnter")
if (m.explicitlyCleared) {
@@ -163,14 +170,14 @@ function skipAtomicInner(doc, pos, oldPos, dir, mayClear) {
if (oldPos) {
let near = m.find(dir < 0 ? 1 : -1), diff
- if (dir < 0 ? m.inclusiveRight : m.inclusiveLeft)
+ if (dir < 0 ? preventCursorRight : preventCursorLeft)
near = movePos(doc, near, -dir, near && near.line == pos.line ? line : null)
if (near && near.line == pos.line && (diff = cmp(near, oldPos)) && (dir < 0 ? diff < 0 : diff > 0))
return skipAtomicInner(doc, near, pos, dir, mayClear)
}
let far = m.find(dir < 0 ? -1 : 1)
- if (dir < 0 ? m.inclusiveLeft : m.inclusiveRight)
+ if (dir < 0 ? preventCursorLeft : preventCursorRight)
far = movePos(doc, far, dir, far.line == pos.line ? line : null)
return far ? skipAtomicInner(doc, far, pos, dir, mayClear) : null
}
diff --git a/src/codemirror/src/modes.js b/src/assets/plugins/codemirror/src/modes.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/modes.js
rename to src/assets/plugins/codemirror/src/modes.js
diff --git a/src/codemirror/src/util/StringStream.js b/src/assets/plugins/codemirror/src/util/StringStream.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/util/StringStream.js
rename to src/assets/plugins/codemirror/src/util/StringStream.js
diff --git a/src/codemirror/src/util/bidi.js b/src/assets/plugins/codemirror/src/util/bidi.js
old mode 100755
new mode 100644
similarity index 97%
rename from src/codemirror/src/util/bidi.js
rename to src/assets/plugins/codemirror/src/util/bidi.js
index 33ab854..92c4191
--- a/src/codemirror/src/util/bidi.js
+++ b/src/assets/plugins/codemirror/src/util/bidi.js
@@ -175,14 +175,15 @@ let bidiOrdering = (function() {
for (++i; i < len && countsAsLeft.test(types[i]); ++i) {}
order.push(new BidiSpan(0, start, i))
} else {
- let pos = i, at = order.length
+ let pos = i, at = order.length, isRTL = direction == "rtl" ? 1 : 0
for (++i; i < len && types[i] != "L"; ++i) {}
for (let j = pos; j < i;) {
if (countsAsNum.test(types[j])) {
- if (pos < j) order.splice(at, 0, new BidiSpan(1, pos, j))
+ if (pos < j) { order.splice(at, 0, new BidiSpan(1, pos, j)); at += isRTL }
let nstart = j
for (++j; j < i && countsAsNum.test(types[j]); ++j) {}
order.splice(at, 0, new BidiSpan(2, nstart, j))
+ at += isRTL
pos = j
} else ++j
}
diff --git a/src/codemirror/src/util/browser.js b/src/assets/plugins/codemirror/src/util/browser.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/util/browser.js
rename to src/assets/plugins/codemirror/src/util/browser.js
diff --git a/src/codemirror/src/util/dom.js b/src/assets/plugins/codemirror/src/util/dom.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/util/dom.js
rename to src/assets/plugins/codemirror/src/util/dom.js
diff --git a/src/codemirror/src/util/event.js b/src/assets/plugins/codemirror/src/util/event.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/util/event.js
rename to src/assets/plugins/codemirror/src/util/event.js
diff --git a/src/codemirror/src/util/feature_detection.js b/src/assets/plugins/codemirror/src/util/feature_detection.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/util/feature_detection.js
rename to src/assets/plugins/codemirror/src/util/feature_detection.js
diff --git a/src/codemirror/src/util/misc.js b/src/assets/plugins/codemirror/src/util/misc.js
old mode 100755
new mode 100644
similarity index 92%
rename from src/codemirror/src/util/misc.js
rename to src/assets/plugins/codemirror/src/util/misc.js
index 39661eb..6dc8d86
--- a/src/codemirror/src/util/misc.js
+++ b/src/assets/plugins/codemirror/src/util/misc.js
@@ -29,10 +29,28 @@ export function countColumn(string, end, tabSize, startIndex, startValue) {
}
export class Delayed {
- constructor() {this.id = null}
+ constructor() {
+ this.id = null
+ this.f = null
+ this.time = 0
+ this.handler = bind(this.onTimeout, this)
+ }
+ onTimeout(self) {
+ self.id = 0
+ if (self.time <= +new Date) {
+ self.f()
+ } else {
+ setTimeout(self.handler, self.time - +new Date)
+ }
+ }
set(ms, f) {
- clearTimeout(this.id)
- this.id = setTimeout(f, ms)
+ this.f = f
+ const time = +new Date + ms
+ if (!this.id || time < this.time) {
+ clearTimeout(this.id)
+ this.id = setTimeout(this.handler, ms)
+ this.time = time
+ }
}
}
@@ -43,7 +61,7 @@ export function indexOf(array, elt) {
}
// Number of pixels added to scroller and sizer to hide scrollbar
-export let scrollerGap = 30
+export let scrollerGap = 50
// Returned or thrown by various protocols to signal 'I'm not
// handling this'.
diff --git a/src/codemirror/src/util/operation_group.js b/src/assets/plugins/codemirror/src/util/operation_group.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/util/operation_group.js
rename to src/assets/plugins/codemirror/src/util/operation_group.js
diff --git a/src/codemirror/test/comment_test.js b/src/assets/plugins/codemirror/test/comment_test.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/test/comment_test.js
rename to src/assets/plugins/codemirror/test/comment_test.js
diff --git a/src/codemirror/test/contenteditable_test.js b/src/assets/plugins/codemirror/test/contenteditable_test.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/test/contenteditable_test.js
rename to src/assets/plugins/codemirror/test/contenteditable_test.js
diff --git a/src/codemirror/test/doc_test.js b/src/assets/plugins/codemirror/test/doc_test.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/test/doc_test.js
rename to src/assets/plugins/codemirror/test/doc_test.js
diff --git a/src/codemirror/test/driver.js b/src/assets/plugins/codemirror/test/driver.js
old mode 100755
new mode 100644
similarity index 94%
rename from src/codemirror/test/driver.js
rename to src/assets/plugins/codemirror/test/driver.js
index 8789f73..bc1634e
--- a/src/codemirror/test/driver.js
+++ b/src/assets/plugins/codemirror/test/driver.js
@@ -1,4 +1,4 @@
-var tests = [], filters = [], allNames = [];
+var tests = [], filters = [], nameCounts = {};
function Failure(why) {this.message = why;}
Failure.prototype.toString = function() { return this.message; };
@@ -12,13 +12,12 @@ function indexOf(collection, elt) {
function test(name, run, expectedFail) {
// Force unique names
- var originalName = name;
- var i = 2; // Second function would be NAME_2
- while (indexOf(allNames, name) !== -1){
- name = originalName + "_" + i;
- i++;
+ if (nameCounts[name] == undefined){
+ nameCounts[name] = 2;
+ } else {
+ // Append number if not first test with this name.
+ name = name + '_' + (nameCounts[name]++);
}
- allNames.push(name);
// Add test
tests.push({name: name, func: run, expectedFail: expectedFail});
return name;
diff --git a/src/codemirror/test/emacs_test.js b/src/assets/plugins/codemirror/test/emacs_test.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/test/emacs_test.js
rename to src/assets/plugins/codemirror/test/emacs_test.js
diff --git a/src/codemirror/test/html-hint-test.js b/src/assets/plugins/codemirror/test/html-hint-test.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/test/html-hint-test.js
rename to src/assets/plugins/codemirror/test/html-hint-test.js
diff --git a/src/codemirror/test/index.html b/src/assets/plugins/codemirror/test/index.html
old mode 100755
new mode 100644
similarity index 94%
rename from src/codemirror/test/index.html
rename to src/assets/plugins/codemirror/test/index.html
index 8cfb738..b68ce18
--- a/src/codemirror/test/index.html
+++ b/src/assets/plugins/codemirror/test/index.html
@@ -6,6 +6,10 @@
+
@@ -53,12 +57,13 @@
+
-
-
-
- diff --git a/src/codemirror/demo/anywordhint.html b/src/codemirror/demo/anywordhint.html deleted file mode 100755 index 471b5bd..0000000 --- a/src/codemirror/demo/anywordhint.html +++ /dev/null @@ -1,79 +0,0 @@ - - -Active Line Demo
- - - - -Styling the current cursor line.
- - - -CodeMirror: Any Word Completion Demo - - - - - - - - - - - -- diff --git a/src/codemirror/demo/bidi.html b/src/codemirror/demo/bidi.html deleted file mode 100755 index a7d22d6..0000000 --- a/src/codemirror/demo/bidi.html +++ /dev/null @@ -1,106 +0,0 @@ - - -Any Word Completion Demo
- - -Press ctrl-space to activate autocompletion. The -completion uses -the anyword-hint.js -module, which simply looks at nearby words in the buffer and completes -to those.
- - -CodeMirror: Bi-directional Text Demo - - - - - - - - - -- diff --git a/src/codemirror/demo/btree.html b/src/codemirror/demo/btree.html deleted file mode 100755 index 3188101..0000000 --- a/src/codemirror/demo/btree.html +++ /dev/null @@ -1,83 +0,0 @@ - - -Bi-directional Text Demo
- - - - -Demonstration of bi-directional text support. See - the related - blog post for more background.
- -CodeMirror: B-Tree visualization - - - - - - - - -- diff --git a/src/codemirror/demo/buffers.html b/src/codemirror/demo/buffers.html deleted file mode 100755 index b1f4975..0000000 --- a/src/codemirror/demo/buffers.html +++ /dev/null @@ -1,109 +0,0 @@ - - -B-Tree visualization
- - - - - - - -CodeMirror: Multiple Buffer & Split View Demo - - - - - - - - - - -- diff --git a/src/codemirror/demo/changemode.html b/src/codemirror/demo/changemode.html deleted file mode 100755 index da9b024..0000000 --- a/src/codemirror/demo/changemode.html +++ /dev/null @@ -1,58 +0,0 @@ - - -Multiple Buffer & Split View Demo
- - - -- Select buffer: - -- -- Select buffer: - -- - - -Demonstration of - using linked documents - to provide a split view on a document, and - using
- -swapDoc- to use a single editor to display multiple documents.CodeMirror: Mode-Changing Demo - - - - - - - - - - -- diff --git a/src/codemirror/demo/closebrackets.html b/src/codemirror/demo/closebrackets.html deleted file mode 100755 index d1415ab..0000000 --- a/src/codemirror/demo/closebrackets.html +++ /dev/null @@ -1,52 +0,0 @@ - - -Mode-Changing Demo
- - -On changes to the content of the above editor, a (crude) script -tries to auto-detect the language used, and switches the editor to -either JavaScript or Scheme mode based on that.
- - -CodeMirror: Closebrackets Demo - - - - - - - - - - -- diff --git a/src/codemirror/demo/closetag.html b/src/codemirror/demo/closetag.html deleted file mode 100755 index 4f857fa..0000000 --- a/src/codemirror/demo/closetag.html +++ /dev/null @@ -1,41 +0,0 @@ - - -Closebrackets Demo
- - - -CodeMirror: Close-Tag Demo - - - - - - - - - - - - - - -- diff --git a/src/codemirror/demo/complete.html b/src/codemirror/demo/complete.html deleted file mode 100755 index 2fef796..0000000 --- a/src/codemirror/demo/complete.html +++ /dev/null @@ -1,126 +0,0 @@ - - -Close-Tag Demo
- - - -CodeMirror: Autocomplete Demo - - - - - - - - - - - - - -- diff --git a/src/codemirror/demo/emacs.html b/src/codemirror/demo/emacs.html deleted file mode 100755 index 8f436f8..0000000 --- a/src/codemirror/demo/emacs.html +++ /dev/null @@ -1,76 +0,0 @@ - - -Autocomplete Demo
- - -Press ctrl-space to activate autocompletion. Built -on top of the
- - - - - -show-hint-andjavascript-hint-addons.CodeMirror: Emacs bindings demo - - - - - - - - - - - - - - - - -- diff --git a/src/codemirror/demo/folding.html b/src/codemirror/demo/folding.html deleted file mode 100755 index b61ecee..0000000 --- a/src/codemirror/demo/folding.html +++ /dev/null @@ -1,133 +0,0 @@ - - - -Emacs bindings demo
- - -The emacs keybindings are enabled by -including keymap/emacs.js and setting -the
- -keyMapoption to"emacs". Because -CodeMirror's internal API is quite different from Emacs, they are only -a loose approximation of actual emacs bindings, though.Also note that a lot of browsers disallow certain keys from being -captured. For example, Chrome blocks both Ctrl-W and Ctrl-N, with the -result that idiomatic use of Emacs keys will constantly close your tab -or open a new window.
- - - -CodeMirror: Code Folding Demo - - - - - - - - - - - - - - - - - - - - - - - - - - - -- - diff --git a/src/codemirror/demo/fullscreen.html b/src/codemirror/demo/fullscreen.html deleted file mode 100755 index 06bf03e..0000000 --- a/src/codemirror/demo/fullscreen.html +++ /dev/null @@ -1,83 +0,0 @@ - - -Code Folding Demo
- - -CodeMirror: Full Screen Editing - - - - - - - - - - - - -- diff --git a/src/codemirror/demo/hardwrap.html b/src/codemirror/demo/hardwrap.html deleted file mode 100755 index 999cf01..0000000 --- a/src/codemirror/demo/hardwrap.html +++ /dev/null @@ -1,75 +0,0 @@ - - -Full Screen Editing
- - - -Demonstration of - the fullscreen - addon. Press F11 when cursor is in the editor to - toggle full screen editing. Esc can also be used - to exit full screen editing.
-CodeMirror: Hard-wrapping Demo - - - - - - - - - - -- diff --git a/src/codemirror/demo/html5complete.html b/src/codemirror/demo/html5complete.html deleted file mode 100755 index 6b908a4..0000000 --- a/src/codemirror/demo/html5complete.html +++ /dev/null @@ -1,56 +0,0 @@ - - - -Hard-wrapping Demo
- - -Demonstration of -the hardwrap addon. -The above editor has its change event hooked up to -the
- - - -wrapParagraphsInRangemethod, so that the paragraphs -are reflown as you are typing.CodeMirror: HTML completion demo - - - - - - - - - - - - - - - - - - - -- - diff --git a/src/codemirror/demo/indentwrap.html b/src/codemirror/demo/indentwrap.html deleted file mode 100755 index d61f679..0000000 --- a/src/codemirror/demo/indentwrap.html +++ /dev/null @@ -1,59 +0,0 @@ - - -HTML completion demo
- -Shows the XML completer - parameterized with information about the tags in HTML. - Press ctrl-space to activate completion.
- - - - -CodeMirror: Indented wrapped line demo - - - - - - - - - -- diff --git a/src/codemirror/demo/lint.html b/src/codemirror/demo/lint.html deleted file mode 100755 index 1184232..0000000 --- a/src/codemirror/demo/lint.html +++ /dev/null @@ -1,171 +0,0 @@ - - -Indented wrapped line demo
- - -This page uses a hack on top of the
- - - -"renderLine"- event to make wrapped text line up with the base indentation of - the line.CodeMirror: Linter Demo - - - - - - - - - - - - - - - - - - -- diff --git a/src/codemirror/demo/loadmode.html b/src/codemirror/demo/loadmode.html deleted file mode 100755 index 263d679..0000000 --- a/src/codemirror/demo/loadmode.html +++ /dev/null @@ -1,72 +0,0 @@ - - -Linter Demo
- - - - - - - - - -CodeMirror: Lazy Mode Loading Demo - - - - - - - - - - -- diff --git a/src/codemirror/demo/marker.html b/src/codemirror/demo/marker.html deleted file mode 100755 index 6744ee3..0000000 --- a/src/codemirror/demo/marker.html +++ /dev/null @@ -1,52 +0,0 @@ - - -Lazy Mode Loading Demo
-Current mode: text/plain
- -Filename, mime, or mode name:
- - -CodeMirror: Breakpoint Demo - - - - - - - - - -- diff --git a/src/codemirror/demo/markselection.html b/src/codemirror/demo/markselection.html deleted file mode 100755 index 10734b4..0000000 --- a/src/codemirror/demo/markselection.html +++ /dev/null @@ -1,52 +0,0 @@ - - -Breakpoint Demo
- - -Click the line-number gutter to add or remove 'breakpoints'.
- - - -CodeMirror: Selection Marking Demo - - - - - - - - - - -- diff --git a/src/codemirror/demo/matchhighlighter.html b/src/codemirror/demo/matchhighlighter.html deleted file mode 100755 index 6aa9377..0000000 --- a/src/codemirror/demo/matchhighlighter.html +++ /dev/null @@ -1,103 +0,0 @@ - - -Selection Marking Demo
- - - - -Simple addon to easily mark (and style) selected text. Docs.
- -CodeMirror: Match Highlighter Demo - - - - - - - - - - - - -- diff --git a/src/codemirror/demo/matchtags.html b/src/codemirror/demo/matchtags.html deleted file mode 100755 index a5ff6b0..0000000 --- a/src/codemirror/demo/matchtags.html +++ /dev/null @@ -1,48 +0,0 @@ - - -Match Highlighter Demo
- - - - -Search and highlight occurences of the selected text.
- -CodeMirror: Tag Matcher Demo - - - - - - - - - - - -- diff --git a/src/codemirror/demo/merge.html b/src/codemirror/demo/merge.html deleted file mode 100755 index 6eff813..0000000 --- a/src/codemirror/demo/merge.html +++ /dev/null @@ -1,123 +0,0 @@ - - -Tag Matcher Demo
- - - - - - -Put the cursor on or inside a pair of tags to highlight them. - Press Ctrl-J to jump to the tag that matches the one under the - cursor.
-CodeMirror: merge view demo - - - - - - - - - - - - - - - -- diff --git a/src/codemirror/demo/multiplex.html b/src/codemirror/demo/multiplex.html deleted file mode 100755 index 1336620..0000000 --- a/src/codemirror/demo/multiplex.html +++ /dev/null @@ -1,75 +0,0 @@ - - -merge view demo
- - - - -The
- -merge-addon provides an interface for displaying and merging diffs, -either two-way -or three-way. -The left (or center) pane is editable, and the differences with the -other pane(s) are optionally shown live as you edit -it. In the two-way configuration, there are also options to pad changed -sections to align them, and to collapse unchanged -stretches of text.This addon depends on -the google-diff-match-patch -library to compute the diffs.
- - -CodeMirror: Multiplexing Parser Demo - - - - - - - - - - -- diff --git a/src/codemirror/demo/mustache.html b/src/codemirror/demo/mustache.html deleted file mode 100755 index 2d193f0..0000000 --- a/src/codemirror/demo/mustache.html +++ /dev/null @@ -1,69 +0,0 @@ - - -Multiplexing Parser Demo
- - - - -Demonstration of a multiplexing mode, which, at certain - boundary strings, switches to one or more inner modes. The out - (HTML) mode does not get fed the content of the
- - - -<< - >>blocks. See - the manual and - the source for more - information.CodeMirror: Overlay Parser Demo - - - - - - - - - - -- diff --git a/src/codemirror/demo/panel.html b/src/codemirror/demo/panel.html deleted file mode 100755 index d4f813d..0000000 --- a/src/codemirror/demo/panel.html +++ /dev/null @@ -1,137 +0,0 @@ - - -Overlay Parser Demo
- - - - -Demonstration of a mode that parses HTML, highlighting - the Mustache templating - directives inside of it by using the code - in
- -overlay.js. View - source to see the 15 lines of code needed to accomplish this.CodeMirror: Panel Demo - - - - - - - - - - - - - -- - diff --git a/src/codemirror/demo/placeholder.html b/src/codemirror/demo/placeholder.html deleted file mode 100755 index b3bb5fa..0000000 --- a/src/codemirror/demo/placeholder.html +++ /dev/null @@ -1,45 +0,0 @@ - - -Panel Demo
- -- -- -- The
- -panel- addon allows you to display panels above or below an editor. -
- Click the links below to add panels at the given position: --- -- top - after-top - before-bottom - bottom -
-- You can also replace an existing panel: -
- - - - -CodeMirror: Placeholder demo - - - - - - - - - -- diff --git a/src/codemirror/demo/preview.html b/src/codemirror/demo/preview.html deleted file mode 100755 index 660c792..0000000 --- a/src/codemirror/demo/preview.html +++ /dev/null @@ -1,87 +0,0 @@ - - -Placeholder demo
- - -The placeholder - plug-in adds an option
- - - -placeholderthat can be set to - make text appear in the editor when it is empty and not focused. - If the source textarea has aplaceholderattribute, - it will automatically be inherited.CodeMirror: HTML5 preview - - - - - - - - - - - - -- diff --git a/src/codemirror/demo/requirejs.html b/src/codemirror/demo/requirejs.html deleted file mode 100755 index 0503c92..0000000 --- a/src/codemirror/demo/requirejs.html +++ /dev/null @@ -1,70 +0,0 @@ - - - -HTML5 preview
- - - - -CodeMirror: HTML completion demo - - - - - - - - - - - - -- - diff --git a/src/codemirror/demo/resize.html b/src/codemirror/demo/resize.html deleted file mode 100755 index 850f560..0000000 --- a/src/codemirror/demo/resize.html +++ /dev/null @@ -1,51 +0,0 @@ - - -RequireJS module loading demo
- -This demo does the same thing as - the HTML5 completion demo, but - loads its dependencies - with Require.js, rather than - explicitly. Press ctrl-space to activate - completion.
- - - - - - -CodeMirror: Autoresize Demo - - - - - - - - - -- diff --git a/src/codemirror/demo/rulers.html b/src/codemirror/demo/rulers.html deleted file mode 100755 index ef12987..0000000 --- a/src/codemirror/demo/rulers.html +++ /dev/null @@ -1,49 +0,0 @@ - - -Autoresize Demo
- - -By setting an editor's
- - - -heightstyle -toautoand giving -theviewportMargin-a value ofInfinity, CodeMirror can be made to -automatically resize to fit its content.CodeMirror: Ruler Demo - - - - - - - - - -- diff --git a/src/codemirror/demo/runmode.html b/src/codemirror/demo/runmode.html deleted file mode 100755 index 0284c40..0000000 --- a/src/codemirror/demo/runmode.html +++ /dev/null @@ -1,62 +0,0 @@ - - -Ruler Demo
- - - -Demonstration of -the rulers addon, which -displays vertical lines at given column offsets.
- -CodeMirror: Mode Runner Demo - - - - - - - - - -- diff --git a/src/codemirror/demo/search.html b/src/codemirror/demo/search.html deleted file mode 100755 index 3abb0c7..0000000 --- a/src/codemirror/demo/search.html +++ /dev/null @@ -1,99 +0,0 @@ - - -Mode Runner Demo
- - -
- - - - - -Running a CodeMirror mode outside of the editor. - The
- -CodeMirror.runModefunction, defined - inaddon/runmode/runmode.jstakes the following arguments:-
-
text (string)
- - The document to run through the highlighter. -
mode (mode spec)
- - The mode to use (must be loaded as normal). -
output (function or DOM node)
- - If this is a function, it will be called for each token with
- two arguments, the token's text and the token's style class (may
- be
nullfor unstyled tokens). If it is a DOM node, - the tokens will be converted tospanelements as in - an editor, and inserted into the node - (throughinnerHTML).
-
CodeMirror: Search/Replace Demo - - - - - - - - - - - - - - - - - -- diff --git a/src/codemirror/demo/simplemode.html b/src/codemirror/demo/simplemode.html deleted file mode 100755 index 6b44a78..0000000 --- a/src/codemirror/demo/simplemode.html +++ /dev/null @@ -1,185 +0,0 @@ - - -Search/Replace Demo
- - - - -Demonstration of primitive search/replace functionality. The - keybindings (which can be configured with custom keymaps) are:
--
-
- Ctrl-F / Cmd-F
- Start searching -
- Ctrl-G / Cmd-G
- Find next -
- Shift-Ctrl-G / Shift-Cmd-G
- Find previous -
- Shift-Ctrl-F / Cmd-Option-F
- Replace -
- Shift-Ctrl-R / Shift-Cmd-Option-F
- Replace all -
- Alt-F
- Persistent search (dialog doesn't autoclose, - enter to find next, Shift-Enter to find previous) -
- Alt-G
- Jump to line -
Searching is enabled by - including addon/search/search.js - and addon/search/searchcursor.js. - Jump to line - including addon/search/jump-to-line.js.
-For good-looking input dialogs, you also want to include - addon/dialog/dialog.js - and addon/dialog/dialog.css.
-CodeMirror: Simple Mode Demo - - - - - - - - - - - -- diff --git a/src/codemirror/demo/simplescrollbars.html b/src/codemirror/demo/simplescrollbars.html deleted file mode 100755 index 1604297..0000000 --- a/src/codemirror/demo/simplescrollbars.html +++ /dev/null @@ -1,82 +0,0 @@ - - -Simple Mode Demo
- -The
- -mode/simple-addon allows CodeMirror modes to be specified using a relatively simple -declarative format. This format is not as powerful as writing code -directly against the mode -interface, but is a lot easier to get started with, and -sufficiently expressive for many simple language modes.This interface is still in flux. It is unlikely to be scrapped or -overhauled completely, so do start writing code against it, but -details might change as it stabilizes, and you might have to tweak -your code when upgrading.
- -Simple modes (loosely based on -the Common -JavaScript Syntax Highlighting Specification, which never took -off), are state machines, where each state has a number of rules that -match tokens. A rule describes a type of token that may occur in the -current state, and possibly a transition to another state caused by -that token.
- -The
- - - -CodeMirror.defineSimpleMode(name, states)method -takes a mode name and an object that describes the mode's states. The -editor below shows an example of such a mode (and is itself -highlighted by the mode shown in it).Each state is an array of rules. A rule may have the following properties:
- --
-
regex: string | RegExp
- - The regular expression that matches the token. May be a string
- or a regex object. When a regex, the
ignoreCaseflag - will be taken into account when matching the token. This regex - has to capture groups when thetokenproperty is - an array. If it captures groups, it must capture all of the string - (since JS provides no way to find out where a group matched).
- token: string | array<string> | null
- - An optional token style. Multiple styles can be specified by
- separating them with dots or spaces. When this property holds an array of token styles,
- the
regexfor this rule must capture a group for each array item. -
- sol: boolean
- - When true, this token will only match at the start of the line.
- (The
^regexp marker doesn't work as you'd expect in - this context because of limitations in JavaScript's RegExp - API.)
- next: string
- - When a
nextproperty is present, the mode will - transfer to the state named by the property when the token is - encountered.
- push: string
- - Like
next, but instead replacing the current state - by the new state, the current state is kept on a stack, and can be - returned to with thepopdirective.
- pop: bool
- - When true, and there is another state on the state stack, will - cause the mode to pop that state off the stack and transition to - it. -
mode: {spec, end, persistent}
- - Can be used to embed another mode inside a mode. When present,
- must hold an object with a
specproperty that describes - the embedded mode, and an optionalendend property - that specifies the regexp that will end the extent of the mode. When - apersistentproperty is set (and true), the nested - mode's state will be preserved between occurrences of the mode.
- indent: bool
- - When true, this token changes the indentation to be one unit - more than the current line's indentation. -
dedent: bool
- - When true, this token will pop one scope off the indentation - stack. -
dedentIfLineStart: bool
- - If a token has its
dedentproperty set, it will, by - default, cause lines where it appears at the start to be dedented. - Set this property to false to prevent that behavior.
-
The
- -metaproperty of the states object is special, and -will not be interpreted as a state. Instead, properties set on it will -be set on the mode, which is useful for properties -likelineComment, -which sets the comment style for a mode. The simple mode addon also -recognizes a few such properties:-
-
dontIndentStates: array<string>
- - An array of states in which the mode's auto-indentation should - not take effect. Usually used for multi-line comment and string - states. -
CodeMirror: Simple Scrollbar Demo - - - - - - - - - - - - -- diff --git a/src/codemirror/demo/spanaffectswrapping_shim.html b/src/codemirror/demo/spanaffectswrapping_shim.html deleted file mode 100755 index 46667dd..0000000 --- a/src/codemirror/demo/spanaffectswrapping_shim.html +++ /dev/null @@ -1,85 +0,0 @@ - - -Simple Scrollbar Demo
- - -The
- - -simplescrollbarsaddon defines two -styles of non-native scrollbars:"simple"and"overlay"(click to try), which can be passed to -thescrollbarStyleoption. These implement -the scrollbar using DOM elements, allowing more control over -its appearance.CodeMirror: Automatically derive odd wrapping behavior for your browser - - - --- -CodeMirror
-
-
-
-- diff --git a/src/codemirror/demo/sublime.html b/src/codemirror/demo/sublime.html deleted file mode 100755 index bfe17c5..0000000 --- a/src/codemirror/demo/sublime.html +++ /dev/null @@ -1,77 +0,0 @@ - - -Automatically derive odd wrapping behavior for your browser
- - -This is a hack to automatically derive - a
- - - - - -spanAffectsWrappingregexp for a browser. See the - comments above that variable - inlib/codemirror.js- for some more details.CodeMirror: Sublime Text bindings demo - - - - - - - - - - - - - - - - - - - - - - -- diff --git a/src/codemirror/demo/tern.html b/src/codemirror/demo/tern.html deleted file mode 100755 index c6834e8..0000000 --- a/src/codemirror/demo/tern.html +++ /dev/null @@ -1,133 +0,0 @@ - - -Sublime Text bindings demo
- -The
- -sublimekeymap defines many Sublime Text-specific -bindings for CodeMirror. See the code below for an overview.Enable the keymap by -loading
- -keymap/sublime.js-and setting -thekeyMap-option to"sublime".(A lot of the search functionality is still missing.) - - - -
CodeMirror: Tern Demo - - - - - - - - - - - - - - - - - - - - - - - - - -- diff --git a/src/codemirror/demo/theme.html b/src/codemirror/demo/theme.html deleted file mode 100755 index 7bbc7a4..0000000 --- a/src/codemirror/demo/theme.html +++ /dev/null @@ -1,184 +0,0 @@ - - -Tern Demo
- - -Demonstrates integration of Tern -and CodeMirror. The following keys are bound:
- --
-
- Ctrl-Space
- Autocomplete -
- Ctrl-O
- Find docs for the expression at the cursor -
- Ctrl-I
- Find type at cursor -
- Alt-.
- Jump to definition (Alt-, to jump back) -
- Ctrl-Q
- Rename variable -
- Ctrl-.
- Select all occurrences of a variable -
Documentation is sparse for now. See the top of -the script for a rough API -overview.
- - - -CodeMirror: Theme Demo - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- diff --git a/src/codemirror/demo/trailingspace.html b/src/codemirror/demo/trailingspace.html deleted file mode 100755 index fb55399..0000000 --- a/src/codemirror/demo/trailingspace.html +++ /dev/null @@ -1,48 +0,0 @@ - - -Theme Demo
- - -Select a theme: -
- - -CodeMirror: Trailing Whitespace Demo - - - - - - - - - -- diff --git a/src/codemirror/demo/variableheight.html b/src/codemirror/demo/variableheight.html deleted file mode 100755 index a3af5cf..0000000 --- a/src/codemirror/demo/variableheight.html +++ /dev/null @@ -1,67 +0,0 @@ - - -Trailing Whitespace Demo
- - - - -Uses -the trailingspace -addon to highlight trailing whitespace.
- -CodeMirror: Variable Height Demo - - - - - - - - - - -- diff --git a/src/codemirror/demo/vim.html b/src/codemirror/demo/vim.html deleted file mode 100755 index c939505..0000000 --- a/src/codemirror/demo/vim.html +++ /dev/null @@ -1,113 +0,0 @@ - - -Variable Height Demo
- - -CodeMirror: Vim bindings demo - - - - - - - - - - - - - - - - -- diff --git a/src/codemirror/demo/visibletabs.html b/src/codemirror/demo/visibletabs.html deleted file mode 100755 index f4f5a78..0000000 --- a/src/codemirror/demo/visibletabs.html +++ /dev/null @@ -1,62 +0,0 @@ - - -Vim bindings demo
- -Note: The CodeMirror vim bindings do not have an -active maintainer. That means that if you report bugs in it, they are -likely to go unanswered. It also means that if you want to help, you -are very welcome to look -at the -open issues and see which ones you can solve.
- - -Key buffer:- -The vim keybindings are enabled by including
- -keymap/vim.jsand setting the -keyMapoption tovim.Features
- --
-
- All common motions and operators, including text objects -
- Operator motion orthogonality -
- Visual mode - characterwise, linewise, blockwise -
- Full macro support (q, @) -
- Incremental highlighted search (/, ?, #, *, g#, g*) -
- Search/replace with confirm (:substitute, :%s) -
- Search history -
- Jump lists (Ctrl-o, Ctrl-i) -
- Key/command mapping with API (:map, :nmap, :vmap) -
- Sort (:sort) -
- Marks (`, ') -
- :global -
- Insert mode behaves identical to base CodeMirror -
- Cross-buffer yank/paste -
For the full list of key mappings and Ex commands, refer to the -
defaultKeymapanddefaultExCommandMapat the -top ofkeymap/vim.js. - -Note that while the vim mode tries to emulate the most useful -features of vim as faithfully as possible, it does not strive to -become a complete vim implementation
- - - -CodeMirror: Visible tabs demo - - - - - - - - - -- diff --git a/src/codemirror/demo/widget.html b/src/codemirror/demo/widget.html deleted file mode 100755 index 6fae2d2..0000000 --- a/src/codemirror/demo/widget.html +++ /dev/null @@ -1,85 +0,0 @@ - - -Visible tabs demo
- - -Tabs inside the editor are spans with the -class
- - - -cm-tab, and can be styled.CodeMirror: Inline Widget Demo - - - - - - - - - - -- diff --git a/src/codemirror/demo/xmlcomplete.html b/src/codemirror/demo/xmlcomplete.html deleted file mode 100755 index dbbc9ba..0000000 --- a/src/codemirror/demo/xmlcomplete.html +++ /dev/null @@ -1,119 +0,0 @@ - - -Inline Widget Demo
- - - - -This demo runs JSHint over the code -in the editor (which is the script used on this page), and -inserts line widgets to -display the warnings that JSHint comes up with.
-CodeMirror: XML Autocomplete Demo - - - - - - - - - - - - -- diff --git a/src/codemirror/test/phantom_driver.js b/src/codemirror/test/phantom_driver.js deleted file mode 100755 index dbad08d..0000000 --- a/src/codemirror/test/phantom_driver.js +++ /dev/null @@ -1,31 +0,0 @@ -var page = require('webpage').create(); - -page.open("http://localhost:3000/test/index.html", function (status) { - if (status != "success") { - console.log("page couldn't be loaded successfully"); - phantom.exit(1); - } - waitFor(function () { - return page.evaluate(function () { - var output = document.getElementById('status'); - if (!output) { return false; } - return (/^(\d+ failures?|all passed)/i).test(output.innerText); - }); - }, function () { - var failed = page.evaluate(function () { return window.failed; }); - var output = page.evaluate(function () { - return document.getElementById('output').innerText + "\n" + - document.getElementById('status').innerText; - }); - console.log(output); - phantom.exit(failed > 0 ? 1 : 0); - }); -}); - -function waitFor (test, cb) { - if (test()) { - cb(); - } else { - setTimeout(function () { waitFor(test, cb); }, 250); - } -} diff --git a/src/codemirror/test/run.js b/src/codemirror/test/run.js deleted file mode 100755 index 54984e7..0000000 --- a/src/codemirror/test/run.js +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env node - -var ok = require("./lint").ok; - -var files = new (require('node-static').Server)(); - -var server = require('http').createServer(function (req, res) { - req.addListener('end', function () { - files.serve(req, res, function (err/*, result */) { - if (err) { - console.error(err); - process.exit(1); - } - }); - }).resume(); -}).addListener('error', function (err) { - throw err; -}).listen(3000, function () { - var childProcess = require('child_process'); - var phantomjs = require("phantomjs-prebuilt"); - var childArgs = [ - require("path").join(__dirname, 'phantom_driver.js') - ]; - childProcess.execFile(phantomjs.path, childArgs, function (err, stdout, stderr) { - server.close(); - console.log(stdout); - if (err) console.error(err); - if (stderr) console.error(stderr); - process.exit(err || stderr || !ok ? 1 : 0); - }); -}); diff --git a/src/codemirror/theme/material.css b/src/codemirror/theme/material.css deleted file mode 100755 index 84962a2..0000000 --- a/src/codemirror/theme/material.css +++ /dev/null @@ -1,53 +0,0 @@ -/* - - Name: material - Author: Michael Kaminsky (http://github.com/mkaminsky11) - - Original material color scheme by Mattia Astorino (https://github.com/equinusocio/material-theme) - -*/ - -.cm-s-material.CodeMirror { - background-color: #263238; - color: rgba(233, 237, 237, 1); -} -.cm-s-material .CodeMirror-gutters { - background: #263238; - color: rgb(83,127,126); - border: none; -} -.cm-s-material .CodeMirror-guttermarker, .cm-s-material .CodeMirror-guttermarker-subtle, .cm-s-material .CodeMirror-linenumber { color: rgb(83,127,126); } -.cm-s-material .CodeMirror-cursor { border-left: 1px solid #f8f8f0; } -.cm-s-material div.CodeMirror-selected { background: rgba(255, 255, 255, 0.15); } -.cm-s-material.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); } -.cm-s-material .CodeMirror-line::selection, .cm-s-material .CodeMirror-line > span::selection, .cm-s-material .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); } -.cm-s-material .CodeMirror-line::-moz-selection, .cm-s-material .CodeMirror-line > span::-moz-selection, .cm-s-material .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); } - -.cm-s-material .CodeMirror-activeline-background { background: rgba(0, 0, 0, 0); } -.cm-s-material .cm-keyword { color: rgba(199, 146, 234, 1); } -.cm-s-material .cm-operator { color: rgba(233, 237, 237, 1); } -.cm-s-material .cm-variable-2 { color: #80CBC4; } -.cm-s-material .cm-variable-3, .cm-s-material .cm-type { color: #82B1FF; } -.cm-s-material .cm-builtin { color: #DECB6B; } -.cm-s-material .cm-atom { color: #F77669; } -.cm-s-material .cm-number { color: #F77669; } -.cm-s-material .cm-def { color: rgba(233, 237, 237, 1); } -.cm-s-material .cm-string { color: #C3E88D; } -.cm-s-material .cm-string-2 { color: #80CBC4; } -.cm-s-material .cm-comment { color: #546E7A; } -.cm-s-material .cm-variable { color: #82B1FF; } -.cm-s-material .cm-tag { color: #80CBC4; } -.cm-s-material .cm-meta { color: #80CBC4; } -.cm-s-material .cm-attribute { color: #FFCB6B; } -.cm-s-material .cm-property { color: #80CBAE; } -.cm-s-material .cm-qualifier { color: #DECB6B; } -.cm-s-material .cm-variable-3, .cm-s-material .cm-type { color: #DECB6B; } -.cm-s-material .cm-tag { color: rgba(255, 83, 112, 1); } -.cm-s-material .cm-error { - color: rgba(255, 255, 255, 1.0); - background-color: #EC5F67; -} -.cm-s-material .CodeMirror-matchingbracket { - text-decoration: underline; - color: white !important; -}XML Autocomplete Demo
- - -Press ctrl-space, or type a '<' character to - activate autocompletion. This demo defines a simple schema that - guides completion. The schema can be customized—see - the manual.
- -Development of the
- - -xml-hintaddon was kindly - sponsored - by www.xperiment.mobi.
- Home
diff --git a/src/codemirror/mode/shell/shell.js b/src/assets/plugins/codemirror/mode/shell/shell.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/shell/shell.js
rename to src/assets/plugins/codemirror/mode/shell/shell.js
diff --git a/src/codemirror/mode/shell/test.js b/src/assets/plugins/codemirror/mode/shell/test.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/shell/test.js
rename to src/assets/plugins/codemirror/mode/shell/test.js
diff --git a/src/codemirror/mode/xml/index.html b/src/assets/plugins/codemirror/mode/xml/index.html
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/xml/index.html
rename to src/assets/plugins/codemirror/mode/xml/index.html
diff --git a/src/codemirror/mode/xml/test.js b/src/assets/plugins/codemirror/mode/xml/test.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/xml/test.js
rename to src/assets/plugins/codemirror/mode/xml/test.js
diff --git a/src/codemirror/mode/xml/xml.js b/src/assets/plugins/codemirror/mode/xml/xml.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/xml/xml.js
rename to src/assets/plugins/codemirror/mode/xml/xml.js
diff --git a/src/codemirror/package.json b/src/assets/plugins/codemirror/package.json
old mode 100755
new mode 100644
similarity index 84%
rename from src/codemirror/package.json
rename to src/assets/plugins/codemirror/package.json
index 3330694..7956d37
--- a/src/codemirror/package.json
+++ b/src/assets/plugins/codemirror/package.json
@@ -1,6 +1,6 @@
{
"name": "codemirror",
- "version": "5.46.0",
+ "version": "5.54.0",
"main": "lib/codemirror.js",
"style": "lib/codemirror.css",
"author": {
@@ -21,12 +21,11 @@
"lint": "bin/lint"
},
"devDependencies": {
- "blint": "^1",
+ "blint": "^1.1.0",
"node-static": "0.7.11",
- "phantomjs-prebuilt": "^2.1.12",
- "rollup": "^0.66.2",
- "rollup-plugin-buble": "^0.19.2",
- "rollup-watch": "^4.3.1"
+ "puppeteer": "^1.20.0",
+ "rollup": "^1.26.3",
+ "rollup-plugin-buble": "^0.19.8"
},
"bugs": "http://github.com/codemirror/CodeMirror/issues",
"keywords": [
diff --git a/src/codemirror/rollup.config.js b/src/assets/plugins/codemirror/rollup.config.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/rollup.config.js
rename to src/assets/plugins/codemirror/rollup.config.js
diff --git a/src/codemirror/src/codemirror.js b/src/assets/plugins/codemirror/src/codemirror.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/codemirror.js
rename to src/assets/plugins/codemirror/src/codemirror.js
diff --git a/src/codemirror/src/display/Display.js b/src/assets/plugins/codemirror/src/display/Display.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/display/Display.js
rename to src/assets/plugins/codemirror/src/display/Display.js
diff --git a/src/codemirror/src/display/focus.js b/src/assets/plugins/codemirror/src/display/focus.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/display/focus.js
rename to src/assets/plugins/codemirror/src/display/focus.js
diff --git a/src/codemirror/src/display/gutters.js b/src/assets/plugins/codemirror/src/display/gutters.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/display/gutters.js
rename to src/assets/plugins/codemirror/src/display/gutters.js
diff --git a/src/codemirror/src/display/highlight_worker.js b/src/assets/plugins/codemirror/src/display/highlight_worker.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/display/highlight_worker.js
rename to src/assets/plugins/codemirror/src/display/highlight_worker.js
diff --git a/src/codemirror/src/display/line_numbers.js b/src/assets/plugins/codemirror/src/display/line_numbers.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/display/line_numbers.js
rename to src/assets/plugins/codemirror/src/display/line_numbers.js
diff --git a/src/codemirror/src/display/mode_state.js b/src/assets/plugins/codemirror/src/display/mode_state.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/display/mode_state.js
rename to src/assets/plugins/codemirror/src/display/mode_state.js
diff --git a/src/codemirror/src/display/operations.js b/src/assets/plugins/codemirror/src/display/operations.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/display/operations.js
rename to src/assets/plugins/codemirror/src/display/operations.js
diff --git a/src/codemirror/src/display/scroll_events.js b/src/assets/plugins/codemirror/src/display/scroll_events.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/display/scroll_events.js
rename to src/assets/plugins/codemirror/src/display/scroll_events.js
diff --git a/src/codemirror/src/display/scrollbars.js b/src/assets/plugins/codemirror/src/display/scrollbars.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/display/scrollbars.js
rename to src/assets/plugins/codemirror/src/display/scrollbars.js
diff --git a/src/codemirror/src/display/scrolling.js b/src/assets/plugins/codemirror/src/display/scrolling.js
old mode 100755
new mode 100644
similarity index 97%
rename from src/codemirror/src/display/scrolling.js
rename to src/assets/plugins/codemirror/src/display/scrolling.js
index 26ec993..6d97247
--- a/src/codemirror/src/display/scrolling.js
+++ b/src/assets/plugins/codemirror/src/display/scrolling.js
@@ -165,7 +165,7 @@ export function updateScrollTop(cm, val) {
}
export function setScrollTop(cm, val, forceScroll) {
- val = Math.min(cm.display.scroller.scrollHeight - cm.display.scroller.clientHeight, val)
+ val = Math.max(0, Math.min(cm.display.scroller.scrollHeight - cm.display.scroller.clientHeight, val))
if (cm.display.scroller.scrollTop == val && !forceScroll) return
cm.doc.scrollTop = val
cm.display.scrollbars.setScrollTop(val)
@@ -175,7 +175,7 @@ export function setScrollTop(cm, val, forceScroll) {
// Sync scroller and scrollbar, ensure the gutter elements are
// aligned.
export function setScrollLeft(cm, val, isScroller, forceScroll) {
- val = Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth)
+ val = Math.max(0, Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth))
if ((isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) && !forceScroll) return
cm.doc.scrollLeft = val
alignHorizontally(cm)
diff --git a/src/codemirror/src/display/selection.js b/src/assets/plugins/codemirror/src/display/selection.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/display/selection.js
rename to src/assets/plugins/codemirror/src/display/selection.js
diff --git a/src/codemirror/src/display/update_display.js b/src/assets/plugins/codemirror/src/display/update_display.js
old mode 100755
new mode 100644
similarity index 97%
rename from src/codemirror/src/display/update_display.js
rename to src/assets/plugins/codemirror/src/display/update_display.js
index 20798f5..e6c21a0
--- a/src/codemirror/src/display/update_display.js
+++ b/src/assets/plugins/codemirror/src/display/update_display.js
@@ -74,7 +74,8 @@ function selectionSnapshot(cm) {
function restoreSelection(snapshot) {
if (!snapshot || !snapshot.activeElt || snapshot.activeElt == activeElt()) return
snapshot.activeElt.focus()
- if (snapshot.anchorNode && contains(document.body, snapshot.anchorNode) && contains(document.body, snapshot.focusNode)) {
+ if (!/^(INPUT|TEXTAREA)$/.test(snapshot.activeElt.nodeName) &&
+ snapshot.anchorNode && contains(document.body, snapshot.anchorNode) && contains(document.body, snapshot.focusNode)) {
let sel = window.getSelection(), range = document.createRange()
range.setEnd(snapshot.anchorNode, snapshot.anchorOffset)
range.collapse(false)
@@ -172,6 +173,8 @@ export function postUpdateDisplay(cm, update) {
update.visible = visibleLines(cm.display, cm.doc, viewport)
if (update.visible.from >= cm.display.viewFrom && update.visible.to <= cm.display.viewTo)
break
+ } else if (first) {
+ update.visible = visibleLines(cm.display, cm.doc, viewport)
}
if (!updateDisplayIfNeeded(cm, update)) break
updateHeightsInViewport(cm)
diff --git a/src/codemirror/src/display/update_line.js b/src/assets/plugins/codemirror/src/display/update_line.js
old mode 100755
new mode 100644
similarity index 96%
rename from src/codemirror/src/display/update_line.js
rename to src/assets/plugins/codemirror/src/display/update_line.js
index a436973..50d781e
--- a/src/codemirror/src/display/update_line.js
+++ b/src/assets/plugins/codemirror/src/display/update_line.js
@@ -1,7 +1,7 @@
import { buildLineContent } from "../line/line_data.js"
import { lineNumberFor } from "../line/utils_line.js"
import { ie, ie_version } from "../util/browser.js"
-import { elt } from "../util/dom.js"
+import { elt, classTest } from "../util/dom.js"
import { signalLater } from "../util/operation_group.js"
// When an aspect of a line changes, a string is added to
@@ -124,10 +124,10 @@ function updateLineGutter(cm, lineView, lineN, dims) {
function updateLineWidgets(cm, lineView, dims) {
if (lineView.alignable) lineView.alignable = null
+ let isWidget = classTest("CodeMirror-linewidget")
for (let node = lineView.node.firstChild, next; node; node = next) {
next = node.nextSibling
- if (node.className == "CodeMirror-linewidget")
- lineView.node.removeChild(node)
+ if (isWidget.test(node.className)) lineView.node.removeChild(node)
}
insertLineWidgets(cm, lineView, dims)
}
@@ -157,7 +157,7 @@ function insertLineWidgetsFor(cm, line, lineView, dims, allowAbove) {
if (!line.widgets) return
let wrap = ensureLineWrapped(lineView)
for (let i = 0, ws = line.widgets; i < ws.length; ++i) {
- let widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget")
+ let widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget" + (widget.className ? " " + widget.className : ""))
if (!widget.handleMouseEvents) node.setAttribute("cm-ignore-events", "true")
positionLineWidget(widget, node, lineView, dims)
cm.display.input.setUneditable(node)
diff --git a/src/codemirror/src/display/update_lines.js b/src/assets/plugins/codemirror/src/display/update_lines.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/display/update_lines.js
rename to src/assets/plugins/codemirror/src/display/update_lines.js
diff --git a/src/codemirror/src/display/view_tracking.js b/src/assets/plugins/codemirror/src/display/view_tracking.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/display/view_tracking.js
rename to src/assets/plugins/codemirror/src/display/view_tracking.js
diff --git a/src/codemirror/src/edit/CodeMirror.js b/src/assets/plugins/codemirror/src/edit/CodeMirror.js
old mode 100755
new mode 100644
similarity index 98%
rename from src/codemirror/src/edit/CodeMirror.js
rename to src/assets/plugins/codemirror/src/edit/CodeMirror.js
index 9188e1b..3429da1
--- a/src/codemirror/src/edit/CodeMirror.js
+++ b/src/assets/plugins/codemirror/src/edit/CodeMirror.js
@@ -120,6 +120,9 @@ function registerEventHandlers(cm) {
// which point we can't mess with it anymore. Context menu is
// handled in onMouseDown for these browsers.
on(d.scroller, "contextmenu", e => onContextMenu(cm, e))
+ on(d.input.getField(), "contextmenu", e => {
+ if (!d.scroller.contains(e.target)) onContextMenu(cm, e)
+ })
// Used to suppress mouse event handling when a touch happens
let touchFinished, prevTouch = {end: 0}
diff --git a/src/codemirror/src/edit/commands.js b/src/assets/plugins/codemirror/src/edit/commands.js
old mode 100755
new mode 100644
similarity index 99%
rename from src/codemirror/src/edit/commands.js
rename to src/assets/plugins/codemirror/src/edit/commands.js
index 3916b12..079379f
--- a/src/codemirror/src/edit/commands.js
+++ b/src/assets/plugins/codemirror/src/edit/commands.js
@@ -170,7 +170,7 @@ function lineStartSmart(cm, pos) {
let line = getLine(cm.doc, start.line)
let order = getOrder(line, cm.doc.direction)
if (!order || order[0].level == 0) {
- let firstNonWS = Math.max(0, line.text.search(/\S/))
+ let firstNonWS = Math.max(start.ch, line.text.search(/\S/))
let inWS = pos.line == start.line && pos.ch <= firstNonWS && pos.ch
return Pos(start.line, inWS ? 0 : firstNonWS, start.sticky)
}
diff --git a/src/codemirror/src/edit/deleteNearSelection.js b/src/assets/plugins/codemirror/src/edit/deleteNearSelection.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/edit/deleteNearSelection.js
rename to src/assets/plugins/codemirror/src/edit/deleteNearSelection.js
diff --git a/src/codemirror/src/edit/drop_events.js b/src/assets/plugins/codemirror/src/edit/drop_events.js
old mode 100755
new mode 100644
similarity index 83%
rename from src/codemirror/src/edit/drop_events.js
rename to src/assets/plugins/codemirror/src/edit/drop_events.js
index 12c760f..f309b2d
--- a/src/codemirror/src/edit/drop_events.js
+++ b/src/assets/plugins/codemirror/src/edit/drop_events.js
@@ -29,28 +29,39 @@ export function onDrop(e) {
// and insert it.
if (files && files.length && window.FileReader && window.File) {
let n = files.length, text = Array(n), read = 0
- let loadFile = (file, i) => {
- if (cm.options.allowDropFileTypes &&
- indexOf(cm.options.allowDropFileTypes, file.type) == -1)
- return
-
- let reader = new FileReader
- reader.onload = operation(cm, () => {
- let content = reader.result
- if (/[\x00-\x08\x0e-\x1f]{2}/.test(content)) content = ""
- text[i] = content
- if (++read == n) {
+ const markAsReadAndPasteIfAllFilesAreRead = () => {
+ if (++read == n) {
+ operation(cm, () => {
pos = clipPos(cm.doc, pos)
let change = {from: pos, to: pos,
- text: cm.doc.splitLines(text.join(cm.doc.lineSeparator())),
+ text: cm.doc.splitLines(
+ text.filter(t => t != null).join(cm.doc.lineSeparator())),
origin: "paste"}
makeChange(cm.doc, change)
- setSelectionReplaceHistory(cm.doc, simpleSelection(pos, changeEnd(change)))
+ setSelectionReplaceHistory(cm.doc, simpleSelection(clipPos(cm.doc, pos), clipPos(cm.doc, changeEnd(change))))
+ })()
+ }
+ }
+ const readTextFromFile = (file, i) => {
+ if (cm.options.allowDropFileTypes &&
+ indexOf(cm.options.allowDropFileTypes, file.type) == -1) {
+ markAsReadAndPasteIfAllFilesAreRead()
+ return
+ }
+ let reader = new FileReader
+ reader.onerror = () => markAsReadAndPasteIfAllFilesAreRead()
+ reader.onload = () => {
+ let content = reader.result
+ if (/[\x00-\x08\x0e-\x1f]{2}/.test(content)) {
+ markAsReadAndPasteIfAllFilesAreRead()
+ return
}
- })
+ text[i] = content
+ markAsReadAndPasteIfAllFilesAreRead()
+ }
reader.readAsText(file)
}
- for (let i = 0; i < n; ++i) loadFile(files[i], i)
+ for (let i = 0; i < files.length; i++) readTextFromFile(files[i], i)
} else { // Normal drop
// Don't do a replace if the drop happened inside of the selected text.
if (cm.state.draggingText && cm.doc.sel.contains(pos) > -1) {
diff --git a/src/codemirror/src/edit/fromTextArea.js b/src/assets/plugins/codemirror/src/edit/fromTextArea.js
old mode 100755
new mode 100644
similarity index 95%
rename from src/codemirror/src/edit/fromTextArea.js
rename to src/assets/plugins/codemirror/src/edit/fromTextArea.js
index 92498c1..35024c5
--- a/src/codemirror/src/edit/fromTextArea.js
+++ b/src/assets/plugins/codemirror/src/edit/fromTextArea.js
@@ -48,7 +48,7 @@ export function fromTextArea(textarea, options) {
textarea.style.display = ""
if (textarea.form) {
off(textarea.form, "submit", save)
- if (typeof textarea.form.submit == "function")
+ if (!options.leaveSubmitMethodAlone && typeof textarea.form.submit == "function")
textarea.form.submit = realSubmit
}
}
diff --git a/src/codemirror/src/edit/global_events.js b/src/assets/plugins/codemirror/src/edit/global_events.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/edit/global_events.js
rename to src/assets/plugins/codemirror/src/edit/global_events.js
diff --git a/src/codemirror/src/edit/key_events.js b/src/assets/plugins/codemirror/src/edit/key_events.js
old mode 100755
new mode 100644
similarity index 93%
rename from src/codemirror/src/edit/key_events.js
rename to src/assets/plugins/codemirror/src/edit/key_events.js
index f0521d0..8f72182
--- a/src/codemirror/src/edit/key_events.js
+++ b/src/assets/plugins/codemirror/src/edit/key_events.js
@@ -2,7 +2,7 @@ import { signalLater } from "../util/operation_group.js"
import { restartBlink } from "../display/selection.js"
import { isModifierKey, keyName, lookupKey } from "../input/keymap.js"
import { eventInWidget } from "../measurement/widgets.js"
-import { ie, ie_version, mac, presto } from "../util/browser.js"
+import { ie, ie_version, mac, presto, gecko } from "../util/browser.js"
import { activeElt, addClass, rmClass } from "../util/dom.js"
import { e_preventDefault, off, on, signalDOMEvent } from "../util/event.js"
import { hasCopyEvent } from "../util/feature_detection.js"
@@ -106,6 +106,7 @@ function handleCharBinding(cm, e, ch) {
let lastStoppedKey = null
export function onKeyDown(e) {
let cm = this
+ if (e.target && e.target != cm.display.input.getField()) return
cm.curOp.focus = activeElt()
if (signalDOMEvent(cm, e)) return
// IE does strange things with escape.
@@ -119,6 +120,8 @@ export function onKeyDown(e) {
if (!handled && code == 88 && !hasCopyEvent && (mac ? e.metaKey : e.ctrlKey))
cm.replaceSelection("", null, "cut")
}
+ if (gecko && !mac && !handled && code == 46 && e.shiftKey && !e.ctrlKey && document.execCommand)
+ document.execCommand("cut")
// Turn mouse into crosshair when Alt is held on Mac.
if (code == 18 && !/\bCodeMirror-crosshair\b/.test(cm.display.lineDiv.className))
@@ -147,6 +150,7 @@ export function onKeyUp(e) {
export function onKeyPress(e) {
let cm = this
+ if (e.target && e.target != cm.display.input.getField()) return
if (eventInWidget(cm.display, e) || signalDOMEvent(cm, e) || e.ctrlKey && !e.altKey || mac && e.metaKey) return
let keyCode = e.keyCode, charCode = e.charCode
if (presto && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return}
diff --git a/src/codemirror/src/edit/legacy.js b/src/assets/plugins/codemirror/src/edit/legacy.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/edit/legacy.js
rename to src/assets/plugins/codemirror/src/edit/legacy.js
diff --git a/src/codemirror/src/edit/main.js b/src/assets/plugins/codemirror/src/edit/main.js
old mode 100755
new mode 100644
similarity index 98%
rename from src/codemirror/src/edit/main.js
rename to src/assets/plugins/codemirror/src/edit/main.js
index b887f8c..e15243a
--- a/src/codemirror/src/edit/main.js
+++ b/src/assets/plugins/codemirror/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
addLegacyProps(CodeMirror)
-CodeMirror.version = "5.46.0"
+CodeMirror.version = "5.54.0"
diff --git a/src/codemirror/src/edit/methods.js b/src/assets/plugins/codemirror/src/edit/methods.js
old mode 100755
new mode 100644
similarity index 99%
rename from src/codemirror/src/edit/methods.js
rename to src/assets/plugins/codemirror/src/edit/methods.js
index e40012e..acf90d1
--- a/src/codemirror/src/edit/methods.js
+++ b/src/assets/plugins/codemirror/src/edit/methods.js
@@ -415,7 +415,7 @@ export default function(CodeMirror) {
clearCaches(this)
scrollToCoords(this, this.doc.scrollLeft, this.doc.scrollTop)
updateGutterSpace(this.display)
- if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5)
+ if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5 || this.options.lineWrapping)
estimateLineHeights(this)
signal(this, "refresh", this)
}),
@@ -469,8 +469,9 @@ function findPosH(doc, pos, dir, unit, visually) {
let oldPos = pos
let origDir = dir
let lineObj = getLine(doc, pos.line)
+ let lineDir = visually && doc.direction == "rtl" ? -dir : dir
function findNextLine() {
- let l = pos.line + dir
+ let l = pos.line + lineDir
if (l < doc.first || l >= doc.first + doc.size) return false
pos = new Pos(l, pos.ch, pos.sticky)
return lineObj = getLine(doc, l)
@@ -484,7 +485,7 @@ function findPosH(doc, pos, dir, unit, visually) {
}
if (next == null) {
if (!boundToLine && findNextLine())
- pos = endOfLine(visually, doc.cm, lineObj, pos.line, dir)
+ pos = endOfLine(visually, doc.cm, lineObj, pos.line, lineDir)
else
return false
} else {
diff --git a/src/codemirror/src/edit/mouse_events.js b/src/assets/plugins/codemirror/src/edit/mouse_events.js
old mode 100755
new mode 100644
similarity index 99%
rename from src/codemirror/src/edit/mouse_events.js
rename to src/assets/plugins/codemirror/src/edit/mouse_events.js
index d0bbfba..5fcc437
--- a/src/codemirror/src/edit/mouse_events.js
+++ b/src/assets/plugins/codemirror/src/edit/mouse_events.js
@@ -7,7 +7,7 @@ import { posFromMouse } from "../measurement/position_measurement.js"
import { eventInWidget } from "../measurement/widgets.js"
import { normalizeSelection, Range, Selection } from "../model/selection.js"
import { extendRange, extendSelection, replaceOneSelection, setSelection } from "../model/selection_updates.js"
-import { captureRightClick, chromeOS, ie, ie_version, mac, webkit } from "../util/browser.js"
+import { captureRightClick, chromeOS, ie, ie_version, mac, webkit, safari } from "../util/browser.js"
import { getOrder, getBidiPartAt } from "../util/bidi.js"
import { activeElt } from "../util/dom.js"
import { e_button, e_defaultPrevented, e_preventDefault, e_target, hasHandler, off, on, signal, signalDOMEvent } from "../util/event.js"
@@ -158,8 +158,8 @@ function leftButtonStartDrag(cm, event, pos, behavior) {
if (!behavior.addNew)
extendSelection(cm.doc, pos, null, null, behavior.extend)
// Work around unexplainable focus problem in IE9 (#2127) and Chrome (#3081)
- if (webkit || ie && ie_version == 9)
- setTimeout(() => {display.wrapper.ownerDocument.body.focus(); display.input.focus()}, 20)
+ if ((webkit && !safari) || ie && ie_version == 9)
+ setTimeout(() => {display.wrapper.ownerDocument.body.focus({preventScroll: true}); display.input.focus()}, 20)
else
display.input.focus()
}
diff --git a/src/codemirror/src/edit/options.js b/src/assets/plugins/codemirror/src/edit/options.js
old mode 100755
new mode 100644
similarity index 97%
rename from src/codemirror/src/edit/options.js
rename to src/assets/plugins/codemirror/src/edit/options.js
index ccca45d..225f549
--- a/src/codemirror/src/edit/options.js
+++ b/src/assets/plugins/codemirror/src/edit/options.js
@@ -68,7 +68,7 @@ export function defineOptions(CodeMirror) {
for (let 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-\u200f\u2028\u2029\ufeff]/g, (cm, val, old) => {
+ option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff\ufff9-\ufffc]/g, (cm, val, old) => {
cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g")
if (old != Init) cm.refresh()
})
@@ -132,6 +132,12 @@ export function defineOptions(CodeMirror) {
}
cm.display.input.readOnlyChanged(val)
})
+
+ option("screenReaderLabel", null, (cm, val) => {
+ val = (val === '') ? null : val
+ cm.display.input.screenReaderLabelChanged(val)
+ })
+
option("disableInput", false, (cm, val) => {if (!val) cm.display.input.reset()}, true)
option("dragDrop", true, dragDropChanged)
option("allowDropFileTypes", null)
diff --git a/src/codemirror/src/edit/utils.js b/src/assets/plugins/codemirror/src/edit/utils.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/edit/utils.js
rename to src/assets/plugins/codemirror/src/edit/utils.js
diff --git a/src/codemirror/src/input/ContentEditableInput.js b/src/assets/plugins/codemirror/src/input/ContentEditableInput.js
old mode 100755
new mode 100644
similarity index 96%
rename from src/codemirror/src/input/ContentEditableInput.js
rename to src/assets/plugins/codemirror/src/input/ContentEditableInput.js
index b77c7d4..b50073e
--- a/src/codemirror/src/input/ContentEditableInput.js
+++ b/src/assets/plugins/codemirror/src/input/ContentEditableInput.js
@@ -31,8 +31,16 @@ export default class ContentEditableInput {
let div = input.div = display.lineDiv
disableBrowserMagic(div, cm.options.spellcheck, cm.options.autocorrect, cm.options.autocapitalize)
+ function belongsToInput(e) {
+ for (let t = e.target; t; t = t.parentNode) {
+ if (t == div) return true
+ if (/\bCodeMirror-(?:line)?widget\b/.test(t.className)) break
+ }
+ return false
+ }
+
on(div, "paste", e => {
- if (signalDOMEvent(cm, e) || handlePaste(e, cm)) return
+ if (!belongsToInput(e) || signalDOMEvent(cm, e) || handlePaste(e, cm)) return
// IE doesn't fire input events, so we schedule a read for the pasted content in this way
if (ie_version <= 11) setTimeout(operation(cm, () => this.updateFromDOM()), 20)
})
@@ -57,7 +65,7 @@ export default class ContentEditableInput {
})
function onCopyCut(e) {
- if (signalDOMEvent(cm, e)) return
+ if (!belongsToInput(e) || signalDOMEvent(cm, e)) return
if (cm.somethingSelected()) {
setLastCopied({lineWise: false, text: cm.getSelections()})
if (e.type == "cut") cm.replaceSelection("", null, "cut")
@@ -99,9 +107,18 @@ export default class ContentEditableInput {
on(div, "cut", onCopyCut)
}
+ screenReaderLabelChanged(label) {
+ // Label for screenreaders, accessibility
+ if(label) {
+ this.div.setAttribute('aria-label', label)
+ } else {
+ this.div.removeAttribute('aria-label')
+ }
+ }
+
prepareSelection() {
let result = prepareSelection(this.cm, false)
- result.focus = this.cm.state.focused
+ result.focus = document.activeElement == this.div
return result
}
@@ -195,7 +212,7 @@ export default class ContentEditableInput {
focus() {
if (this.cm.options.readOnly != "nocursor") {
- if (!this.selectionInEditor())
+ if (!this.selectionInEditor() || document.activeElement != this.div)
this.showSelection(this.prepareSelection(), true)
this.div.focus()
}
diff --git a/src/codemirror/src/input/TextareaInput.js b/src/assets/plugins/codemirror/src/input/TextareaInput.js
old mode 100755
new mode 100644
similarity index 98%
rename from src/codemirror/src/input/TextareaInput.js
rename to src/assets/plugins/codemirror/src/input/TextareaInput.js
index ab02230..8fe14bb
--- a/src/codemirror/src/input/TextareaInput.js
+++ b/src/assets/plugins/codemirror/src/input/TextareaInput.js
@@ -118,6 +118,15 @@ export default class TextareaInput {
this.textarea = this.wrapper.firstChild
}
+ screenReaderLabelChanged(label) {
+ // Label for screenreaders, accessibility
+ if(label) {
+ this.textarea.setAttribute('aria-label', label)
+ } else {
+ this.textarea.removeAttribute('aria-label')
+ }
+ }
+
prepareSelection() {
// Redraw the selection and/or cursor
let cm = this.cm, display = cm.display, doc = cm.doc
diff --git a/src/codemirror/src/input/indent.js b/src/assets/plugins/codemirror/src/input/indent.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/input/indent.js
rename to src/assets/plugins/codemirror/src/input/indent.js
diff --git a/src/codemirror/src/input/input.js b/src/assets/plugins/codemirror/src/input/input.js
old mode 100755
new mode 100644
similarity index 99%
rename from src/codemirror/src/input/input.js
rename to src/assets/plugins/codemirror/src/input/input.js
index 26bba1d..8519ecf
--- a/src/codemirror/src/input/input.js
+++ b/src/assets/plugins/codemirror/src/input/input.js
@@ -132,4 +132,4 @@ export function hiddenTextarea() {
if (ios) te.style.border = "1px solid black"
disableBrowserMagic(te)
return div
-}
+}
\ No newline at end of file
diff --git a/src/codemirror/src/input/keymap.js b/src/assets/plugins/codemirror/src/input/keymap.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/input/keymap.js
rename to src/assets/plugins/codemirror/src/input/keymap.js
diff --git a/src/codemirror/src/input/keynames.js b/src/assets/plugins/codemirror/src/input/keynames.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/input/keynames.js
rename to src/assets/plugins/codemirror/src/input/keynames.js
diff --git a/src/codemirror/src/input/movement.js b/src/assets/plugins/codemirror/src/input/movement.js
old mode 100755
new mode 100644
similarity index 99%
rename from src/codemirror/src/input/movement.js
rename to src/assets/plugins/codemirror/src/input/movement.js
index 8d50fd2..479f221
--- a/src/codemirror/src/input/movement.js
+++ b/src/assets/plugins/codemirror/src/input/movement.js
@@ -15,6 +15,7 @@ export function moveLogically(line, start, dir) {
export function endOfLine(visually, cm, lineObj, lineNo, dir) {
if (visually) {
+ if (cm.doc.direction == "rtl") dir = -dir
let order = getOrder(lineObj, cm.doc.direction)
if (order) {
let part = dir < 0 ? lst(order) : order[0]
diff --git a/src/codemirror/src/line/highlight.js b/src/assets/plugins/codemirror/src/line/highlight.js
old mode 100755
new mode 100644
similarity index 99%
rename from src/codemirror/src/line/highlight.js
rename to src/assets/plugins/codemirror/src/line/highlight.js
index 9835d46..7b4ca0b
--- a/src/codemirror/src/line/highlight.js
+++ b/src/assets/plugins/codemirror/src/line/highlight.js
@@ -198,7 +198,7 @@ function extractLineClasses(type, output) {
let prop = lineClass[1] ? "bgClass" : "textClass"
if (output[prop] == null)
output[prop] = lineClass[2]
- else if (!(new RegExp("(?:^|\s)" + lineClass[2] + "(?:$|\s)")).test(output[prop]))
+ else if (!(new RegExp("(?:^|\\s)" + lineClass[2] + "(?:$|\\s)")).test(output[prop]))
output[prop] += " " + lineClass[2]
}
return type
diff --git a/src/codemirror/src/line/line_data.js b/src/assets/plugins/codemirror/src/line/line_data.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/line/line_data.js
rename to src/assets/plugins/codemirror/src/line/line_data.js
diff --git a/src/codemirror/src/line/pos.js b/src/assets/plugins/codemirror/src/line/pos.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/line/pos.js
rename to src/assets/plugins/codemirror/src/line/pos.js
diff --git a/src/codemirror/src/line/saw_special_spans.js b/src/assets/plugins/codemirror/src/line/saw_special_spans.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/line/saw_special_spans.js
rename to src/assets/plugins/codemirror/src/line/saw_special_spans.js
diff --git a/src/codemirror/src/line/spans.js b/src/assets/plugins/codemirror/src/line/spans.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/line/spans.js
rename to src/assets/plugins/codemirror/src/line/spans.js
diff --git a/src/codemirror/src/line/utils_line.js b/src/assets/plugins/codemirror/src/line/utils_line.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/line/utils_line.js
rename to src/assets/plugins/codemirror/src/line/utils_line.js
diff --git a/src/codemirror/src/measurement/position_measurement.js b/src/assets/plugins/codemirror/src/measurement/position_measurement.js
old mode 100755
new mode 100644
similarity index 98%
rename from src/codemirror/src/measurement/position_measurement.js
rename to src/assets/plugins/codemirror/src/measurement/position_measurement.js
index eb78287..bb0ad50
--- a/src/codemirror/src/measurement/position_measurement.js
+++ b/src/assets/plugins/codemirror/src/measurement/position_measurement.js
@@ -18,7 +18,7 @@ export function paddingTop(display) {return display.lineSpace.offsetTop}
export function paddingVert(display) {return display.mover.offsetHeight - display.lineSpace.offsetHeight}
export function paddingH(display) {
if (display.cachedPaddingH) return display.cachedPaddingH
- let e = removeChildrenAndAdd(display.measure, elt("pre", "x"))
+ let e = removeChildrenAndAdd(display.measure, elt("pre", "x", "CodeMirror-line-like"))
let style = window.getComputedStyle ? window.getComputedStyle(e) : e.currentStyle
let data = {left: parseInt(style.paddingLeft), right: parseInt(style.paddingRight)}
if (!isNaN(data.left) && !isNaN(data.right)) display.cachedPaddingH = data
@@ -412,7 +412,7 @@ export function estimateCoords(cm, pos) {
function PosWithInfo(line, ch, sticky, outside, xRel) {
let pos = Pos(line, ch, sticky)
pos.xRel = xRel
- if (outside) pos.outside = true
+ if (outside) pos.outside = outside
return pos
}
@@ -421,16 +421,16 @@ function PosWithInfo(line, ch, sticky, outside, xRel) {
export function coordsChar(cm, x, y) {
let doc = cm.doc
y += cm.display.viewOffset
- if (y < 0) return PosWithInfo(doc.first, 0, null, true, -1)
+ if (y < 0) return PosWithInfo(doc.first, 0, null, -1, -1)
let lineN = lineAtHeight(doc, y), last = doc.first + doc.size - 1
if (lineN > last)
- return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, null, true, 1)
+ return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, null, 1, 1)
if (x < 0) x = 0
let lineObj = getLine(doc, lineN)
for (;;) {
let found = coordsCharInner(cm, lineObj, lineN, x, y)
- let collapsed = collapsedSpanAround(lineObj, found.ch + (found.xRel > 0 ? 1 : 0))
+ let collapsed = collapsedSpanAround(lineObj, found.ch + (found.xRel > 0 || found.outside > 0 ? 1 : 0))
if (!collapsed) return found
let rangeEnd = collapsed.find(1)
if (rangeEnd.line == lineN) return rangeEnd
@@ -518,7 +518,7 @@ function coordsCharInner(cm, lineObj, lineNo, x, y) {
// base X position
let coords = cursorCoords(cm, Pos(lineNo, ch, sticky), "line", lineObj, preparedMeasure)
baseX = coords.left
- outside = y < coords.top || y >= coords.bottom
+ outside = y < coords.top ? -1 : y >= coords.bottom ? 1 : 0
}
ch = skipExtendingChars(lineObj.text, ch, 1)
@@ -585,7 +585,7 @@ let measureText
export function textHeight(display) {
if (display.cachedTextHeight != null) return display.cachedTextHeight
if (measureText == null) {
- measureText = elt("pre")
+ measureText = elt("pre", null, "CodeMirror-line-like")
// Measure a bunch of lines, for browsers that compute
// fractional heights.
for (let i = 0; i < 49; ++i) {
@@ -605,7 +605,7 @@ export function textHeight(display) {
export function charWidth(display) {
if (display.cachedCharWidth != null) return display.cachedCharWidth
let anchor = elt("span", "xxxxxxxxxx")
- let pre = elt("pre", [anchor])
+ let pre = elt("pre", [anchor], "CodeMirror-line-like")
removeChildrenAndAdd(display.measure, pre)
let rect = anchor.getBoundingClientRect(), width = (rect.right - rect.left) / 10
if (width > 2) display.cachedCharWidth = width
@@ -679,7 +679,7 @@ export function posFromMouse(cm, e, liberal, forRect) {
try { x = e.clientX - space.left; y = e.clientY - space.top }
catch (e) { return null }
let coords = coordsChar(cm, x, y), line
- if (forRect && coords.xRel == 1 && (line = getLine(cm.doc, coords.line).text).length == coords.ch) {
+ if (forRect && coords.xRel > 0 && (line = getLine(cm.doc, coords.line).text).length == coords.ch) {
let colDiff = countColumn(line, line.length, cm.options.tabSize) - line.length
coords = Pos(coords.line, Math.max(0, Math.round((x - paddingH(cm.display).left) / charWidth(cm.display)) - colDiff))
}
diff --git a/src/codemirror/src/measurement/widgets.js b/src/assets/plugins/codemirror/src/measurement/widgets.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/measurement/widgets.js
rename to src/assets/plugins/codemirror/src/measurement/widgets.js
diff --git a/src/codemirror/src/model/Doc.js b/src/assets/plugins/codemirror/src/model/Doc.js
old mode 100755
new mode 100644
similarity index 99%
rename from src/codemirror/src/model/Doc.js
rename to src/assets/plugins/codemirror/src/model/Doc.js
index 956f752..c305eee
--- a/src/codemirror/src/model/Doc.js
+++ b/src/assets/plugins/codemirror/src/model/Doc.js
@@ -197,7 +197,10 @@ Doc.prototype = createObj(BranchChunk.prototype, {
for (let i = 0; i < hist.undone.length; i++) if (!hist.undone[i].ranges) ++undone
return {undo: done, redo: undone}
},
- clearHistory: function() {this.history = new History(this.history.maxGeneration)},
+ clearHistory: function() {
+ this.history = new History(this.history.maxGeneration)
+ linkedDocs(this, doc => doc.history = this.history, true)
+ },
markClean: function() {
this.cleanGeneration = this.changeGeneration(true)
diff --git a/src/codemirror/src/model/change_measurement.js b/src/assets/plugins/codemirror/src/model/change_measurement.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/model/change_measurement.js
rename to src/assets/plugins/codemirror/src/model/change_measurement.js
diff --git a/src/codemirror/src/model/changes.js b/src/assets/plugins/codemirror/src/model/changes.js
old mode 100755
new mode 100644
similarity index 98%
rename from src/codemirror/src/model/changes.js
rename to src/assets/plugins/codemirror/src/model/changes.js
index 7a68883..48d2f6b
--- a/src/codemirror/src/model/changes.js
+++ b/src/assets/plugins/codemirror/src/model/changes.js
@@ -15,7 +15,7 @@ import { changeEnd, computeSelAfterChange } from "./change_measurement.js"
import { isWholeLineUpdate, linkedDocs, updateDoc } from "./document_data.js"
import { addChangeToHistory, historyChangeFromChange, mergeOldSpans, pushSelectionToHistory } from "./history.js"
import { Range, Selection } from "./selection.js"
-import { setSelection, setSelectionNoUndo } from "./selection_updates.js"
+import { setSelection, setSelectionNoUndo, skipAtomic } from "./selection_updates.js"
// UPDATING
@@ -202,6 +202,9 @@ function makeChangeSingleDoc(doc, change, selAfter, spans) {
if (doc.cm) makeChangeSingleDocInEditor(doc.cm, change, spans)
else updateDoc(doc, change, spans)
setSelectionNoUndo(doc, selAfter, sel_dontScroll)
+
+ if (doc.cantEdit && skipAtomic(doc, Pos(doc.firstLine(), 0)))
+ doc.cantEdit = false
}
// Handle the interaction of a change to a document with the editor
diff --git a/src/codemirror/src/model/chunk.js b/src/assets/plugins/codemirror/src/model/chunk.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/model/chunk.js
rename to src/assets/plugins/codemirror/src/model/chunk.js
diff --git a/src/codemirror/src/model/document_data.js b/src/assets/plugins/codemirror/src/model/document_data.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/model/document_data.js
rename to src/assets/plugins/codemirror/src/model/document_data.js
diff --git a/src/codemirror/src/model/history.js b/src/assets/plugins/codemirror/src/model/history.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/model/history.js
rename to src/assets/plugins/codemirror/src/model/history.js
diff --git a/src/codemirror/src/model/line_widget.js b/src/assets/plugins/codemirror/src/model/line_widget.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/model/line_widget.js
rename to src/assets/plugins/codemirror/src/model/line_widget.js
diff --git a/src/codemirror/src/model/mark_text.js b/src/assets/plugins/codemirror/src/model/mark_text.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/model/mark_text.js
rename to src/assets/plugins/codemirror/src/model/mark_text.js
diff --git a/src/codemirror/src/model/selection.js b/src/assets/plugins/codemirror/src/model/selection.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/model/selection.js
rename to src/assets/plugins/codemirror/src/model/selection.js
diff --git a/src/codemirror/src/model/selection_updates.js b/src/assets/plugins/codemirror/src/model/selection_updates.js
old mode 100755
new mode 100644
similarity index 91%
rename from src/codemirror/src/model/selection_updates.js
rename to src/assets/plugins/codemirror/src/model/selection_updates.js
index c9941b7..4db2bd7
--- a/src/codemirror/src/model/selection_updates.js
+++ b/src/assets/plugins/codemirror/src/model/selection_updates.js
@@ -150,8 +150,15 @@ function skipAtomicInner(doc, pos, oldPos, dir, mayClear) {
let line = getLine(doc, pos.line)
if (line.markedSpans) for (let i = 0; i < line.markedSpans.length; ++i) {
let sp = line.markedSpans[i], m = sp.marker
- if ((sp.from == null || (m.inclusiveLeft ? sp.from <= pos.ch : sp.from < pos.ch)) &&
- (sp.to == null || (m.inclusiveRight ? sp.to >= pos.ch : sp.to > pos.ch))) {
+
+ // Determine if we should prevent the cursor being placed to the left/right of an atomic marker
+ // Historically this was determined using the inclusiveLeft/Right option, but the new way to control it
+ // is with selectLeft/Right
+ let preventCursorLeft = ("selectLeft" in m) ? !m.selectLeft : m.inclusiveLeft
+ let preventCursorRight = ("selectRight" in m) ? !m.selectRight : m.inclusiveRight
+
+ if ((sp.from == null || (preventCursorLeft ? sp.from <= pos.ch : sp.from < pos.ch)) &&
+ (sp.to == null || (preventCursorRight ? sp.to >= pos.ch : sp.to > pos.ch))) {
if (mayClear) {
signal(m, "beforeCursorEnter")
if (m.explicitlyCleared) {
@@ -163,14 +170,14 @@ function skipAtomicInner(doc, pos, oldPos, dir, mayClear) {
if (oldPos) {
let near = m.find(dir < 0 ? 1 : -1), diff
- if (dir < 0 ? m.inclusiveRight : m.inclusiveLeft)
+ if (dir < 0 ? preventCursorRight : preventCursorLeft)
near = movePos(doc, near, -dir, near && near.line == pos.line ? line : null)
if (near && near.line == pos.line && (diff = cmp(near, oldPos)) && (dir < 0 ? diff < 0 : diff > 0))
return skipAtomicInner(doc, near, pos, dir, mayClear)
}
let far = m.find(dir < 0 ? -1 : 1)
- if (dir < 0 ? m.inclusiveLeft : m.inclusiveRight)
+ if (dir < 0 ? preventCursorLeft : preventCursorRight)
far = movePos(doc, far, dir, far.line == pos.line ? line : null)
return far ? skipAtomicInner(doc, far, pos, dir, mayClear) : null
}
diff --git a/src/codemirror/src/modes.js b/src/assets/plugins/codemirror/src/modes.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/modes.js
rename to src/assets/plugins/codemirror/src/modes.js
diff --git a/src/codemirror/src/util/StringStream.js b/src/assets/plugins/codemirror/src/util/StringStream.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/util/StringStream.js
rename to src/assets/plugins/codemirror/src/util/StringStream.js
diff --git a/src/codemirror/src/util/bidi.js b/src/assets/plugins/codemirror/src/util/bidi.js
old mode 100755
new mode 100644
similarity index 97%
rename from src/codemirror/src/util/bidi.js
rename to src/assets/plugins/codemirror/src/util/bidi.js
index 33ab854..92c4191
--- a/src/codemirror/src/util/bidi.js
+++ b/src/assets/plugins/codemirror/src/util/bidi.js
@@ -175,14 +175,15 @@ let bidiOrdering = (function() {
for (++i; i < len && countsAsLeft.test(types[i]); ++i) {}
order.push(new BidiSpan(0, start, i))
} else {
- let pos = i, at = order.length
+ let pos = i, at = order.length, isRTL = direction == "rtl" ? 1 : 0
for (++i; i < len && types[i] != "L"; ++i) {}
for (let j = pos; j < i;) {
if (countsAsNum.test(types[j])) {
- if (pos < j) order.splice(at, 0, new BidiSpan(1, pos, j))
+ if (pos < j) { order.splice(at, 0, new BidiSpan(1, pos, j)); at += isRTL }
let nstart = j
for (++j; j < i && countsAsNum.test(types[j]); ++j) {}
order.splice(at, 0, new BidiSpan(2, nstart, j))
+ at += isRTL
pos = j
} else ++j
}
diff --git a/src/codemirror/src/util/browser.js b/src/assets/plugins/codemirror/src/util/browser.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/util/browser.js
rename to src/assets/plugins/codemirror/src/util/browser.js
diff --git a/src/codemirror/src/util/dom.js b/src/assets/plugins/codemirror/src/util/dom.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/util/dom.js
rename to src/assets/plugins/codemirror/src/util/dom.js
diff --git a/src/codemirror/src/util/event.js b/src/assets/plugins/codemirror/src/util/event.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/util/event.js
rename to src/assets/plugins/codemirror/src/util/event.js
diff --git a/src/codemirror/src/util/feature_detection.js b/src/assets/plugins/codemirror/src/util/feature_detection.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/util/feature_detection.js
rename to src/assets/plugins/codemirror/src/util/feature_detection.js
diff --git a/src/codemirror/src/util/misc.js b/src/assets/plugins/codemirror/src/util/misc.js
old mode 100755
new mode 100644
similarity index 92%
rename from src/codemirror/src/util/misc.js
rename to src/assets/plugins/codemirror/src/util/misc.js
index 39661eb..6dc8d86
--- a/src/codemirror/src/util/misc.js
+++ b/src/assets/plugins/codemirror/src/util/misc.js
@@ -29,10 +29,28 @@ export function countColumn(string, end, tabSize, startIndex, startValue) {
}
export class Delayed {
- constructor() {this.id = null}
+ constructor() {
+ this.id = null
+ this.f = null
+ this.time = 0
+ this.handler = bind(this.onTimeout, this)
+ }
+ onTimeout(self) {
+ self.id = 0
+ if (self.time <= +new Date) {
+ self.f()
+ } else {
+ setTimeout(self.handler, self.time - +new Date)
+ }
+ }
set(ms, f) {
- clearTimeout(this.id)
- this.id = setTimeout(f, ms)
+ this.f = f
+ const time = +new Date + ms
+ if (!this.id || time < this.time) {
+ clearTimeout(this.id)
+ this.id = setTimeout(this.handler, ms)
+ this.time = time
+ }
}
}
@@ -43,7 +61,7 @@ export function indexOf(array, elt) {
}
// Number of pixels added to scroller and sizer to hide scrollbar
-export let scrollerGap = 30
+export let scrollerGap = 50
// Returned or thrown by various protocols to signal 'I'm not
// handling this'.
diff --git a/src/codemirror/src/util/operation_group.js b/src/assets/plugins/codemirror/src/util/operation_group.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/src/util/operation_group.js
rename to src/assets/plugins/codemirror/src/util/operation_group.js
diff --git a/src/codemirror/test/comment_test.js b/src/assets/plugins/codemirror/test/comment_test.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/test/comment_test.js
rename to src/assets/plugins/codemirror/test/comment_test.js
diff --git a/src/codemirror/test/contenteditable_test.js b/src/assets/plugins/codemirror/test/contenteditable_test.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/test/contenteditable_test.js
rename to src/assets/plugins/codemirror/test/contenteditable_test.js
diff --git a/src/codemirror/test/doc_test.js b/src/assets/plugins/codemirror/test/doc_test.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/test/doc_test.js
rename to src/assets/plugins/codemirror/test/doc_test.js
diff --git a/src/codemirror/test/driver.js b/src/assets/plugins/codemirror/test/driver.js
old mode 100755
new mode 100644
similarity index 94%
rename from src/codemirror/test/driver.js
rename to src/assets/plugins/codemirror/test/driver.js
index 8789f73..bc1634e
--- a/src/codemirror/test/driver.js
+++ b/src/assets/plugins/codemirror/test/driver.js
@@ -1,4 +1,4 @@
-var tests = [], filters = [], allNames = [];
+var tests = [], filters = [], nameCounts = {};
function Failure(why) {this.message = why;}
Failure.prototype.toString = function() { return this.message; };
@@ -12,13 +12,12 @@ function indexOf(collection, elt) {
function test(name, run, expectedFail) {
// Force unique names
- var originalName = name;
- var i = 2; // Second function would be NAME_2
- while (indexOf(allNames, name) !== -1){
- name = originalName + "_" + i;
- i++;
+ if (nameCounts[name] == undefined){
+ nameCounts[name] = 2;
+ } else {
+ // Append number if not first test with this name.
+ name = name + '_' + (nameCounts[name]++);
}
- allNames.push(name);
// Add test
tests.push({name: name, func: run, expectedFail: expectedFail});
return name;
diff --git a/src/codemirror/test/emacs_test.js b/src/assets/plugins/codemirror/test/emacs_test.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/test/emacs_test.js
rename to src/assets/plugins/codemirror/test/emacs_test.js
diff --git a/src/codemirror/test/html-hint-test.js b/src/assets/plugins/codemirror/test/html-hint-test.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/test/html-hint-test.js
rename to src/assets/plugins/codemirror/test/html-hint-test.js
diff --git a/src/codemirror/test/index.html b/src/assets/plugins/codemirror/test/index.html
old mode 100755
new mode 100644
similarity index 94%
rename from src/codemirror/test/index.html
rename to src/assets/plugins/codemirror/test/index.html
index 8cfb738..b68ce18
--- a/src/codemirror/test/index.html
+++ b/src/assets/plugins/codemirror/test/index.html
@@ -6,6 +6,10 @@
+
@@ -53,12 +57,13 @@
+
-
-
-
- Home
diff --git a/src/codemirror/mode/php/php.js b/src/assets/plugins/codemirror/mode/php/php.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/php/php.js
rename to src/assets/plugins/codemirror/mode/php/php.js
diff --git a/src/codemirror/mode/php/test.js b/src/assets/plugins/codemirror/mode/php/test.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/php/test.js
rename to src/assets/plugins/codemirror/mode/php/test.js
diff --git a/src/codemirror/mode/powershell/index.html b/src/assets/plugins/codemirror/mode/powershell/index.html
old mode 100755
new mode 100644
similarity index 99%
rename from src/codemirror/mode/powershell/index.html
rename to src/assets/plugins/codemirror/mode/powershell/index.html
index 6bb7bab..fae0298
--- a/src/codemirror/mode/powershell/index.html
+++ b/src/assets/plugins/codemirror/mode/powershell/index.html
@@ -28,6 +28,10 @@
- Home
diff --git a/src/codemirror/mode/perl/perl.js b/src/assets/plugins/codemirror/mode/perl/perl.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/perl/perl.js
rename to src/assets/plugins/codemirror/mode/perl/perl.js
diff --git a/src/codemirror/mode/php/index.html b/src/assets/plugins/codemirror/mode/php/index.html
old mode 100755
new mode 100644
similarity index 97%
rename from src/codemirror/mode/php/index.html
rename to src/assets/plugins/codemirror/mode/php/index.html
index 6897641..0de6ae6
--- a/src/codemirror/mode/php/index.html
+++ b/src/assets/plugins/codemirror/mode/php/index.html
@@ -15,7 +15,7 @@
- Home
diff --git a/src/codemirror/mode/lua/lua.js b/src/assets/plugins/codemirror/mode/lua/lua.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/lua/lua.js
rename to src/assets/plugins/codemirror/mode/lua/lua.js
diff --git a/src/codemirror/mode/meta.js b/src/assets/plugins/codemirror/mode/meta.js
old mode 100755
new mode 100644
similarity index 97%
rename from src/codemirror/mode/meta.js
rename to src/assets/plugins/codemirror/mode/meta.js
index ef0a26a..9f64f41
--- a/src/codemirror/mode/meta.js
+++ b/src/assets/plugins/codemirror/mode/meta.js
@@ -20,7 +20,7 @@
{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"]},
@@ -84,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"},
@@ -94,7 +94,8 @@
{name: "NSIS", mime: "text/x-nsis", mode: "nsis", ext: ["nsh", "nsi"]},
{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: "Objective-C", mime: "text/x-objectivec", mode: "clike", ext: ["m"], alias: ["objective-c", "objc"]},
+ {name: "Objective-C++", mime: "text/x-objectivec++", mode: "clike", ext: ["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"]},
@@ -105,6 +106,7 @@
{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"]},
@@ -142,7 +144,7 @@
{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"},
+ {name: "TiddlyWiki", mime: "text/x-tiddlywiki", mode: "tiddlywiki"},
{name: "Tiki wiki", mime: "text/tiki", mode: "tiki"},
{name: "TOML", mime: "text/x-toml", mode: "toml", ext: ["toml"]},
{name: "Tornado", mime: "text/x-tornado", mode: "tornado"},
@@ -188,6 +190,7 @@
};
CodeMirror.findModeByExtension = function(ext) {
+ ext = ext.toLowerCase();
for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
var info = CodeMirror.modeInfo[i];
if (info.ext) for (var j = 0; j < info.ext.length; j++)
diff --git a/src/codemirror/mode/perl/index.html b/src/assets/plugins/codemirror/mode/perl/index.html
old mode 100755
new mode 100644
similarity index 97%
rename from src/codemirror/mode/perl/index.html
rename to src/assets/plugins/codemirror/mode/perl/index.html
index 901718a..b879b33
--- a/src/codemirror/mode/perl/index.html
+++ b/src/assets/plugins/codemirror/mode/perl/index.html
@@ -9,7 +9,7 @@
- Home
diff --git a/src/codemirror/mode/lua/index.html b/src/assets/plugins/codemirror/mode/lua/index.html
old mode 100755
new mode 100644
similarity index 98%
rename from src/codemirror/mode/lua/index.html
rename to src/assets/plugins/codemirror/mode/lua/index.html
index 59f4df3..05c9446
--- a/src/codemirror/mode/lua/index.html
+++ b/src/assets/plugins/codemirror/mode/lua/index.html
@@ -11,7 +11,7 @@
- Home
diff --git a/src/codemirror/mode/javascript/javascript.js b/src/assets/plugins/codemirror/mode/javascript/javascript.js
old mode 100755
new mode 100644
similarity index 96%
rename from src/codemirror/mode/javascript/javascript.js
rename to src/assets/plugins/codemirror/mode/javascript/javascript.js
index 0f83664..c657763
--- a/src/codemirror/mode/javascript/javascript.js
+++ b/src/assets/plugins/codemirror/mode/javascript/javascript.js
@@ -67,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");
@@ -75,10 +75,10 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
return ret(ch);
} else if (ch == "=" && stream.eat(">")) {
return ret("=>", "operator");
- } else if (ch == "0" && stream.match(/^(?:x[\da-f]+|o[0-7]+|b[01]+)n?/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*(?:n|(?:\.\d*)?(?:[eE][+\-]?\d+)?)?/);
+ stream.match(/^[\d_]*(?:n|(?:\.[\d_]*)?(?:[eE][+\-]?[\d_]+)?)?/);
return ret("number", "number");
} else if (ch == "/") {
if (stream.eat("*")) {
@@ -98,9 +98,14 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
} else if (ch == "`") {
state.tokenize = tokenQuasi;
return tokenQuasi(stream, state);
- } else if (ch == "#") {
+ } else if (ch == "#" && stream.peek() == "!") {
stream.skipToEnd();
- return ret("error", "error");
+ return ret("meta", "meta");
+ } else if (ch == "#" && stream.eatWhile(wordRE)) {
+ return ret("variable", "property")
+ } else if (ch == "<" && stream.match("!--") || ch == "-" && stream.match("->")) {
+ stream.skipToEnd()
+ return ret("comment", "comment")
} else if (isOperatorChar.test(ch)) {
if (ch != ">" || !state.lexical || state.lexical.type != ">") {
if (stream.eat("=")) {
@@ -110,6 +115,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
if (ch == ">") stream.eat(ch)
}
}
+ if (ch == "?" && stream.eat(".")) return ret(".")
return ret("operator", "operator", stream.current());
} else if (wordRE.test(ch)) {
stream.eatWhile(wordRE);
@@ -195,8 +201,12 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
++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;
@@ -410,7 +420,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
}
function parenExpr(type) {
if (type != "(") return pass()
- return cont(pushlex(")"), expression, expect(")"), poplex)
+ return cont(pushlex(")"), maybeexpression, expect(")"), poplex)
}
function expressionInner(type, value, noComma) {
if (cx.state.fatArrowAt == cx.stream.start) {
@@ -439,7 +449,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
}
function maybeoperatorComma(type, value) {
- if (type == ",") return cont(expression);
+ if (type == ",") return cont(maybeexpression);
return maybeoperatorNoComma(type, value, false);
}
function maybeoperatorNoComma(type, value, noComma) {
@@ -448,7 +458,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
if (type == "=>") return cont(pushcontext, noComma ? arrowBodyNoComma : arrowBody, popcontext);
if (type == "operator") {
if (/\+\+|--/.test(value) || isTS && value == "!") return cont(me);
- if (isTS && value == "<" && cx.stream.match(/^([^>]|<.*?>)*>\s*\(/, false))
+ 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);
@@ -574,10 +584,13 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
}
function maybetype(type, value) {
if (isTS) {
- if (type == ":" || value == "in") return cont(typeexpr);
+ if (type == ":") return cont(typeexpr);
if (value == "?") return cont(maybetype);
}
}
+ function maybetypeOrIn(type, value) {
+ if (isTS && (type == ":" || value == "in")) return cont(typeexpr)
+ }
function mayberettype(type) {
if (isTS && type == ":") {
if (cx.stream.match(/^\s*\w+\s+is\b/, false)) return cont(expression, isKW, typeexpr)
@@ -618,7 +631,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
} else if (type == ":") {
return cont(typeexpr)
} else if (type == "[") {
- return cont(expect("variable"), maybetype, expect("]"), typeprop)
+ return cont(expect("variable"), maybetypeOrIn, expect("]"), typeprop)
} else if (type == "(") {
return pass(functiondecl, typeprop)
}
@@ -747,11 +760,11 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
}
if (type == "variable" || cx.style == "keyword") {
cx.marked = "property";
- return cont(isTS ? classfield : functiondef, classBody);
+ return cont(classfield, classBody);
}
- if (type == "number" || type == "string") return cont(isTS ? classfield : functiondef, classBody);
+ if (type == "number" || type == "string") return cont(classfield, classBody);
if (type == "[")
- return cont(expression, maybetype, expect("]"), isTS ? classfield : functiondef, classBody)
+ return cont(expression, maybetype, expect("]"), classfield, classBody)
if (value == "*") {
cx.marked = "keyword";
return cont(classBody);
diff --git a/src/codemirror/mode/javascript/json-ld.html b/src/assets/plugins/codemirror/mode/javascript/json-ld.html
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/javascript/json-ld.html
rename to src/assets/plugins/codemirror/mode/javascript/json-ld.html
diff --git a/src/codemirror/mode/javascript/test.js b/src/assets/plugins/codemirror/mode/javascript/test.js
old mode 100755
new mode 100644
similarity index 95%
rename from src/codemirror/mode/javascript/test.js
rename to src/assets/plugins/codemirror/mode/javascript/test.js
index 04faeaf..ffff05f
--- a/src/codemirror/mode/javascript/test.js
+++ b/src/assets/plugins/codemirror/mode/javascript/test.js
@@ -127,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]);",
@@ -298,6 +301,30 @@
"[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];")
+
+ MT("private properties",
+ "[keyword class] [def C] {",
+ " [property #x] [operator =] [number 2];",
+ " [property #read]() {",
+ " [keyword return] [keyword this].[property #x]",
+ " }",
+ "}")
+
var ts_mode = CodeMirror.getMode({indentUnit: 2}, "application/typescript")
function TS(name) {
test.mode(name, ts_mode, Array.prototype.slice.call(arguments, 1))
diff --git a/src/codemirror/mode/javascript/typescript.html b/src/assets/plugins/codemirror/mode/javascript/typescript.html
old mode 100755
new mode 100644
similarity index 97%
rename from src/codemirror/mode/javascript/typescript.html
rename to src/assets/plugins/codemirror/mode/javascript/typescript.html
index 3b217a4..7da84d2
--- a/src/codemirror/mode/javascript/typescript.html
+++ b/src/assets/plugins/codemirror/mode/javascript/typescript.html
@@ -10,7 +10,7 @@
- Get the current version: 5.46.0.
+ Get the current version: 5.54.0.
You can see the code,
read the release notes,
or study the user manual. @@ -195,4 +195,19 @@ pretty well. +
+
+
+
+
diff --git a/src/codemirror/keymap/emacs.js b/src/assets/plugins/codemirror/keymap/emacs.js
old mode 100755
new mode 100644
similarity index 99%
rename from src/codemirror/keymap/emacs.js
rename to src/assets/plugins/codemirror/keymap/emacs.js
index d96a6fb..fe4882e
--- a/src/codemirror/keymap/emacs.js
+++ b/src/assets/plugins/codemirror/keymap/emacs.js
@@ -369,6 +369,7 @@
"Ctrl-/": repeated("undo"), "Shift-Ctrl--": repeated("undo"),
"Ctrl-Z": repeated("undo"), "Cmd-Z": repeated("undo"),
+ "Shift-Ctrl-Z": "redo",
"Shift-Alt-,": "goDocStart", "Shift-Alt-.": "goDocEnd",
"Ctrl-S": "findPersistentNext", "Ctrl-R": "findPersistentPrev", "Ctrl-G": quit, "Shift-Alt-5": "replace",
"Alt-/": "autocomplete",
@@ -403,7 +404,8 @@
"Ctrl-X H": "selectAll",
"Ctrl-Q Tab": repeated("insertTab"),
- "Ctrl-U": addPrefixMap
+ "Ctrl-U": addPrefixMap,
+ "fallthrough": "default"
});
var prefixMap = {"Ctrl-G": clearPrefix};
diff --git a/src/codemirror/keymap/sublime.js b/src/assets/plugins/codemirror/keymap/sublime.js
old mode 100755
new mode 100644
similarity index 94%
rename from src/codemirror/keymap/sublime.js
rename to src/assets/plugins/codemirror/keymap/sublime.js
index 799641a..7edf172
--- a/src/codemirror/keymap/sublime.js
+++ b/src/assets/plugins/codemirror/keymap/sublime.js
@@ -22,17 +22,21 @@
if (dir < 0 && start.ch == 0) return doc.clipPos(Pos(start.line - 1));
var line = doc.getLine(start.line);
if (dir > 0 && start.ch >= line.length) return doc.clipPos(Pos(start.line + 1, 0));
- var state = "start", type;
- for (var pos = start.ch, e = dir < 0 ? 0 : line.length, i = 0; pos != e; pos += dir, i++) {
+ var state = "start", type, startPos = start.ch;
+ for (var pos = startPos, e = dir < 0 ? 0 : line.length, i = 0; pos != e; pos += dir, i++) {
var next = line.charAt(dir < 0 ? pos - 1 : pos);
var cat = next != "_" && CodeMirror.isWordChar(next) ? "w" : "o";
if (cat == "w" && next.toUpperCase() == next) cat = "W";
if (state == "start") {
if (cat != "o") { state = "in"; type = cat; }
+ else startPos = pos + dir
} else if (state == "in") {
if (type != cat) {
if (type == "w" && cat == "W" && dir < 0) pos--;
- if (type == "W" && cat == "w" && dir > 0) { type = "w"; continue; }
+ if (type == "W" && cat == "w" && dir > 0) { // From uppercase to lowercase
+ if (pos == startPos + 1) { type = "w"; continue; }
+ else pos--;
+ }
break;
}
}
@@ -144,14 +148,24 @@
cur = cm.getSearchCursor(query, Pos(cm.firstLine(), 0));
found = cur.findNext();
}
- if (!found || isSelectedRange(cm.listSelections(), cur.from(), cur.to()))
- return CodeMirror.Pass
+ if (!found || isSelectedRange(cm.listSelections(), cur.from(), cur.to())) return
cm.addSelection(cur.from(), cur.to());
}
if (fullWord)
cm.state.sublimeFindFullWord = cm.doc.sel;
};
+ cmds.skipAndSelectNextOccurrence = function(cm) {
+ var prevAnchor = cm.getCursor("anchor"), prevHead = cm.getCursor("head");
+ cmds.selectNextOccurrence(cm);
+ if (CodeMirror.cmpPos(prevAnchor, prevHead) != 0) {
+ cm.doc.setSelections(cm.doc.listSelections()
+ .filter(function (sel) {
+ return sel.anchor != prevAnchor || sel.head != prevHead;
+ }));
+ }
+ }
+
function addCursorToSelection(cm, dir) {
var ranges = cm.listSelections(), newRanges = [];
for (var i = 0; i < ranges.length; i++) {
@@ -175,7 +189,8 @@
function isSelectedRange(ranges, from, to) {
for (var i = 0; i < ranges.length; i++)
- if (ranges[i].from() == from && ranges[i].to() == to) return true
+ if (CodeMirror.cmpPos(ranges[i].from(), from) == 0 &&
+ CodeMirror.cmpPos(ranges[i].to(), to) == 0) return true
return false
}
@@ -213,11 +228,15 @@
if (!selectBetweenBrackets(cm)) return CodeMirror.Pass;
};
+ function puncType(type) {
+ return !type ? null : /\bpunctuation\b/.test(type) ? type : undefined
+ }
+
cmds.goToBracket = function(cm) {
cm.extendSelectionsBy(function(range) {
- var next = cm.scanForBracket(range.head, 1);
+ var next = cm.scanForBracket(range.head, 1, puncType(cm.getTokenTypeAt(range.head)));
if (next && CodeMirror.cmpPos(next.pos, range.head) != 0) return next.pos;
- var prev = cm.scanForBracket(range.head, -1);
+ var prev = cm.scanForBracket(range.head, -1, puncType(cm.getTokenTypeAt(Pos(range.head.line, range.head.ch + 1))));
return prev && Pos(prev.pos.line, prev.pos.ch + 1) || range.head;
});
};
@@ -597,6 +616,7 @@
"Shift-Cmd-F2": "clearBookmarks",
"Alt-F2": "selectBookmarks",
"Backspace": "smartBackspace",
+ "Cmd-K Cmd-D": "skipAndSelectNextOccurrence",
"Cmd-K Cmd-K": "delLineRight",
"Cmd-K Cmd-U": "upcaseAtCursor",
"Cmd-K Cmd-L": "downcaseAtCursor",
@@ -608,6 +628,7 @@
"Cmd-K Cmd-C": "showInCenter",
"Cmd-K Cmd-G": "clearBookmarks",
"Cmd-K Cmd-Backspace": "delLineLeft",
+ "Cmd-K Cmd-1": "foldAll",
"Cmd-K Cmd-0": "unfoldAll",
"Cmd-K Cmd-J": "unfoldAll",
"Ctrl-Shift-Up": "addCursorToPrevLine",
@@ -657,6 +678,7 @@
"Shift-Ctrl-F2": "clearBookmarks",
"Alt-F2": "selectBookmarks",
"Backspace": "smartBackspace",
+ "Ctrl-K Ctrl-D": "skipAndSelectNextOccurrence",
"Ctrl-K Ctrl-K": "delLineRight",
"Ctrl-K Ctrl-U": "upcaseAtCursor",
"Ctrl-K Ctrl-L": "downcaseAtCursor",
@@ -668,6 +690,7 @@
"Ctrl-K Ctrl-C": "showInCenter",
"Ctrl-K Ctrl-G": "clearBookmarks",
"Ctrl-K Ctrl-Backspace": "delLineLeft",
+ "Ctrl-K Ctrl-1": "foldAll",
"Ctrl-K Ctrl-0": "unfoldAll",
"Ctrl-K Ctrl-J": "unfoldAll",
"Ctrl-Alt-Up": "addCursorToPrevLine",
diff --git a/src/codemirror/keymap/vim.js b/src/assets/plugins/codemirror/keymap/vim.js
old mode 100755
new mode 100644
similarity index 96%
rename from src/codemirror/keymap/vim.js
rename to src/assets/plugins/codemirror/keymap/vim.js
index 5758823..b5be59c
--- a/src/codemirror/keymap/vim.js
+++ b/src/assets/plugins/codemirror/keymap/vim.js
@@ -164,7 +164,9 @@
{ keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'eol' }, context: 'normal' },
{ keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'endOfSelectedArea' }, context: 'visual' },
{ keys: 'i', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'inplace' }, context: 'normal' },
+ { keys: 'gi', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'lastEdit' }, context: 'normal' },
{ keys: 'I', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'firstNonBlank'}, context: 'normal' },
+ { keys: 'gI', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'bol'}, context: 'normal' },
{ keys: 'I', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'startOfSelectedArea' }, context: 'visual' },
{ keys: 'o', type: 'action', action: 'newLineAndEnterInsertMode', isEdit: true, interlaceInsertRepeat: true, actionArgs: { after: true }, context: 'normal' },
{ keys: 'O', type: 'action', action: 'newLineAndEnterInsertMode', isEdit: true, interlaceInsertRepeat: true, actionArgs: { after: false }, context: 'normal' },
@@ -174,13 +176,15 @@
{ keys: '', type: 'action', action: 'toggleVisualMode', actionArgs: { blockwise: true }},
{ keys: 'gv', type: 'action', action: 'reselectLastSelection' },
{ keys: 'J', type: 'action', action: 'joinLines', isEdit: true },
+ { keys: 'gJ', type: 'action', action: 'joinLines', actionArgs: { keepSpaces: true }, isEdit: true },
{ keys: 'p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: true, isEdit: true }},
{ keys: 'P', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: false, isEdit: true }},
{ keys: 'r', type: 'action', action: 'replace', isEdit: true },
{ keys: '@', type: 'action', action: 'replayMacro' },
{ keys: 'q', type: 'action', action: 'enterMacroRecordMode' },
// Handle Replace-mode as a special case of insert mode.
- { keys: 'R', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { replace: true }},
+ { keys: 'R', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { replace: true }, context: 'normal'},
+ { keys: 'R', type: 'operator', operator: 'change', operatorArgs: { linewise: true, fullLine: true }, context: 'visual', exitVisualBlock: true},
{ keys: 'u', type: 'action', action: 'undo', context: 'normal' },
{ keys: 'u', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: true}, context: 'visual', isEdit: true },
{ keys: 'U', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: false}, context: 'visual', isEdit: true },
@@ -230,7 +234,6 @@
{ name: 'undo', shortName: 'u' },
{ name: 'redo', shortName: 'red' },
{ name: 'set', shortName: 'se' },
- { name: 'set', shortName: 'se' },
{ name: 'setlocal', shortName: 'setl' },
{ name: 'setglobal', shortName: 'setg' },
{ name: 'sort', shortName: 'sor' },
@@ -286,41 +289,44 @@
enterVimMode(cm);
}
- function fatCursorMarks(cm) {
+ function updateFatCursorMark(cm) {
+ if (!cm.state.fatCursorMarks) return;
+ clearFatCursorMark(cm);
var ranges = cm.listSelections(), result = []
for (var i = 0; i < ranges.length; i++) {
- var range = ranges[i]
+ var range = ranges[i];
if (range.empty()) {
- if (range.anchor.ch < cm.getLine(range.anchor.line).length) {
+ var lineLength = cm.getLine(range.anchor.line).length;
+ if (range.anchor.ch < lineLength) {
result.push(cm.markText(range.anchor, Pos(range.anchor.line, range.anchor.ch + 1),
- {className: "cm-fat-cursor-mark"}))
+ {className: "cm-fat-cursor-mark"}));
} else {
- var widget = document.createElement("span")
- widget.textContent = "\u00a0"
- widget.className = "cm-fat-cursor-mark"
- result.push(cm.setBookmark(range.anchor, {widget: widget}))
+ result.push(cm.markText(Pos(range.anchor.line, lineLength - 1),
+ Pos(range.anchor.line, lineLength),
+ {className: "cm-fat-cursor-mark"}));
}
}
}
- return result
+ cm.state.fatCursorMarks = result;
}
- function updateFatCursorMark(cm) {
- var marks = cm.state.fatCursorMarks
- if (marks) for (var i = 0; i < marks.length; i++) marks[i].clear()
- cm.state.fatCursorMarks = fatCursorMarks(cm)
+ function clearFatCursorMark(cm) {
+ var marks = cm.state.fatCursorMarks;
+ if (marks) for (var i = 0; i < marks.length; i++) marks[i].clear();
}
function enableFatCursorMark(cm) {
- cm.state.fatCursorMarks = fatCursorMarks(cm)
+ cm.state.fatCursorMarks = [];
+ updateFatCursorMark(cm)
cm.on("cursorActivity", updateFatCursorMark)
}
function disableFatCursorMark(cm) {
- var marks = cm.state.fatCursorMarks
- if (marks) for (var i = 0; i < marks.length; i++) marks[i].clear()
- cm.state.fatCursorMarks = null
- cm.off("cursorActivity", updateFatCursorMark)
+ clearFatCursorMark(cm);
+ cm.off("cursorActivity", updateFatCursorMark);
+ // explicitly set fatCursorMarks to null because event listener above
+ // can be invoke after removing it, if off is called from operation
+ cm.state.fatCursorMarks = null;
}
// Deprecated, simply setting the keymap works again.
@@ -591,9 +597,16 @@
}
return mark;
}
+ function find(cm, offset) {
+ var oldPointer = pointer;
+ var mark = move(cm, offset);
+ pointer = oldPointer;
+ return mark && mark.find();
+ }
return {
cachedCursor: undefined, //used for # and * jumps
add: add,
+ find: find,
move: move
};
};
@@ -1290,6 +1303,10 @@
}
inputState.operator = command.operator;
inputState.operatorArgs = copyArgs(command.operatorArgs);
+ if (command.exitVisualBlock) {
+ vim.visualBlock = false;
+ updateCmSelection(cm);
+ }
if (vim.visualMode) {
// Operating on a selection in visual mode. We don't need a motion.
this.evalInput(cm, vim);
@@ -1585,10 +1602,10 @@
}
if (vim.visualMode) {
if (!(vim.visualBlock && newHead.ch === Infinity)) {
- newHead = clipCursorToContent(cm, newHead, vim.visualBlock);
+ newHead = clipCursorToContent(cm, newHead);
}
if (newAnchor) {
- newAnchor = clipCursorToContent(cm, newAnchor, true);
+ newAnchor = clipCursorToContent(cm, newAnchor);
}
newAnchor = newAnchor || oldAnchor;
sel.anchor = newAnchor;
@@ -1714,6 +1731,7 @@
vim.lastEditActionCommand = actionCommand;
macroModeState.lastInsertModeChanges.changes = [];
macroModeState.lastInsertModeChanges.expectCursorActivityForChange = false;
+ macroModeState.lastInsertModeChanges.visualBlock = vim.visualBlock ? vim.sel.head.line - vim.sel.anchor.line : 0;
}
};
@@ -1839,12 +1857,18 @@
var line = motionArgs.forward ? cur.line + repeat : cur.line - repeat;
var first = cm.firstLine();
var last = cm.lastLine();
+ var posV = cm.findPosV(cur, (motionArgs.forward ? repeat : -repeat), 'line', vim.lastHSPos);
+ var hasMarkedText = motionArgs.forward ? posV.line > line : posV.line < line;
+ if (hasMarkedText) {
+ line = posV.line;
+ endCh = posV.ch;
+ }
// Vim go to line begin or line end when cursor at first/last line and
// move to previous/next line is triggered.
if (line < first && cur.line == first){
return this.moveToStartOfLine(cm, head, motionArgs, vim);
}else if (line > last && cur.line == last){
- return this.moveToEol(cm, head, motionArgs, vim);
+ return this.moveToEol(cm, head, motionArgs, vim, true);
}
if (motionArgs.toFirstChar){
endCh=findFirstNonWhiteSpaceCharacter(cm.getLine(line));
@@ -1946,13 +1970,15 @@
vim.lastHSPos = cm.charCoords(head,'div').left;
return moveToColumn(cm, repeat);
},
- moveToEol: function(cm, head, motionArgs, vim) {
+ moveToEol: function(cm, head, motionArgs, vim, keepHPos) {
var cur = head;
- vim.lastHPos = Infinity;
var retval= Pos(cur.line + motionArgs.repeat - 1, Infinity);
var end=cm.clipPos(retval);
end.ch--;
- vim.lastHSPos = cm.charCoords(end,'div').left;
+ if (!keepHPos) {
+ vim.lastHPos = Infinity;
+ vim.lastHSPos = cm.charCoords(end,'div').left;
+ }
return retval;
},
moveToFirstNonWhiteSpaceCharacter: function(cm, head) {
@@ -2004,7 +2030,7 @@
'{': '}', '}': '{',
'[': ']', ']': '[',
'<': '>', '>': '<'};
- var selfPaired = {'\'': true, '"': true};
+ var selfPaired = {'\'': true, '"': true, '`': true};
var character = motionArgs.selectedCharacter;
// 'b' refers to '()' block.
@@ -2092,10 +2118,9 @@
change: function(cm, args, ranges) {
var finalHead, text;
var vim = cm.state.vim;
- vimGlobalState.macroModeState.lastInsertModeChanges.inVisualBlock = vim.visualBlock;
+ var anchor = ranges[0].anchor,
+ head = ranges[0].head;
if (!vim.visualMode) {
- var anchor = ranges[0].anchor,
- head = ranges[0].head;
text = cm.getRange(anchor, head);
var lastState = vim.lastEditInputState || {};
if (lastState.motion == "moveByWords" && !isWhiteSpaceString(text)) {
@@ -2123,6 +2148,13 @@
anchor.ch = Number.MAX_VALUE;
}
finalHead = anchor;
+ } else if (args.fullLine) {
+ head.ch = Number.MAX_VALUE;
+ head.line--;
+ cm.setSelection(anchor, head)
+ text = cm.getSelection();
+ cm.replaceSelection("");
+ finalHead = anchor;
} else {
text = cm.getSelection();
var replacement = fillArray('', ranges.length);
@@ -2167,8 +2199,7 @@
vimGlobalState.registerController.pushText(
args.registerName, 'delete', text,
args.linewise, vim.visualBlock);
- var includeLineBreak = vim.insertMode
- return clipCursorToContent(cm, finalHead, includeLineBreak);
+ return clipCursorToContent(cm, finalHead);
},
indent: function(cm, args, ranges) {
var vim = cm.state.vim;
@@ -2315,6 +2346,8 @@
var macroModeState = vimGlobalState.macroModeState;
if (registerName == '@') {
registerName = macroModeState.latestRegister;
+ } else {
+ macroModeState.latestRegister = registerName;
}
while(repeat--){
executeMacroRegister(cm, vim, macroModeState, registerName);
@@ -2348,11 +2381,15 @@
var height = cm.listSelections().length;
if (insertAt == 'eol') {
head = Pos(head.line, lineLength(cm, head.line));
+ } else if (insertAt == 'bol') {
+ head = Pos(head.line, 0);
} else if (insertAt == 'charAfter') {
head = offsetCursor(head, 0, 1);
} else if (insertAt == 'firstNonBlank') {
head = motions.moveToFirstNonWhiteSpaceCharacter(cm, head);
} else if (insertAt == 'startOfSelectedArea') {
+ if (!vim.visualMode)
+ return;
if (!vim.visualBlock) {
if (sel.head.line < sel.anchor.line) {
head = sel.head;
@@ -2366,6 +2403,8 @@
height = Math.abs(sel.head.line - sel.anchor.line) + 1;
}
} else if (insertAt == 'endOfSelectedArea') {
+ if (!vim.visualMode)
+ return;
if (!vim.visualBlock) {
if (sel.head.line >= sel.anchor.line) {
head = offsetCursor(sel.head, 0, 1);
@@ -2382,6 +2421,8 @@
if (vim.visualMode){
return;
}
+ } else if (insertAt == 'lastEdit') {
+ head = getLastEditPos(cm) || head;
}
cm.setOption('disableInput', false);
if (actionArgs && actionArgs.replace) {
@@ -2417,8 +2458,7 @@
vim.visualLine = !!actionArgs.linewise;
vim.visualBlock = !!actionArgs.blockwise;
head = clipCursorToContent(
- cm, Pos(anchor.line, anchor.ch + repeat - 1),
- true /** includeLineBreak */);
+ cm, Pos(anchor.line, anchor.ch + repeat - 1));
vim.sel = {
anchor: anchor,
head: head
@@ -2490,7 +2530,9 @@
var tmp = Pos(curStart.line + 1,
lineLength(cm, curStart.line + 1));
var text = cm.getRange(curStart, tmp);
- text = text.replace(/\n\s*/g, ' ');
+ text = actionArgs.keepSpaces
+ ? text.replace(/\n\r?/g, '')
+ : text.replace(/\n\s*/g, ' ');
cm.replaceRange(text, curStart, tmp);
}
var curFinalPos = Pos(curStart.line, finalCh);
@@ -2559,7 +2601,17 @@
}
var linewise = register.linewise;
var blockwise = register.blockwise;
- if (linewise) {
+ if (blockwise) {
+ text = text.split('\n');
+ if (linewise) {
+ text.pop();
+ }
+ for (var i = 0; i < text.length; i++) {
+ text[i] = (text[i] == '') ? ' ' : text[i];
+ }
+ cur.ch += actionArgs.after ? 1 : 0;
+ cur.ch = Math.min(lineLength(cm, cur.line), cur.ch);
+ } else if (linewise) {
if(vim.visualMode) {
text = vim.visualLine ? text.slice(0, -1) : '\n' + text.slice(0, text.length - 1) + '\n';
} else if (actionArgs.after) {
@@ -2571,12 +2623,6 @@
cur.ch = 0;
}
} else {
- if (blockwise) {
- text = text.split('\n');
- for (var i = 0; i < text.length; i++) {
- text[i] = (text[i] == '') ? ' ' : text[i];
- }
- }
cur.ch += actionArgs.after ? 1 : 0;
}
var curPosFinal;
@@ -2788,10 +2834,11 @@
* Clips cursor to ensure that line is within the buffer's range
* If includeLineBreak is true, then allow cur.ch == lineLength.
*/
- function clipCursorToContent(cm, cur, includeLineBreak) {
+ function clipCursorToContent(cm, cur) {
+ var vim = cm.state.vim;
+ var includeLineBreak = vim.insertMode || vim.visualMode;
var line = Math.min(Math.max(cm.firstLine(), cur.line), cm.lastLine() );
- var maxCh = lineLength(cm, line) - 1;
- maxCh = (includeLineBreak) ? maxCh + 1 : maxCh;
+ var maxCh = lineLength(cm, line) - 1 + !!includeLineBreak;
var ch = Math.min(Math.max(0, cur.ch), maxCh);
return Pos(line, ch);
}
@@ -2811,12 +2858,6 @@
}
return Pos(cur.line + offsetLine, cur.ch + offsetCh);
}
- function getOffset(anchor, head) {
- return {
- line: head.line - anchor.line,
- ch: head.line - anchor.line
- };
- }
function commandMatches(keys, keyMap, context, inputState) {
// Partial matches are not applied. They inform the key handler
// that the current key sequence is a subsequence of a valid key
@@ -3163,9 +3204,7 @@
vim.visualLine = false;
vim.visualBlock = false;
CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
- if (vim.fakeCursor) {
- vim.fakeCursor.clear();
- }
+ clearFakeCursor(vim);
}
// Remove any trailing newlines from the selection. For
@@ -4064,7 +4103,7 @@
}
// Unescape \ and / in the replace part, for PCRE mode.
- var unescapes = {'\\/': '/', '\\\\': '\\', '\\n': '\n', '\\r': '\r', '\\t': '\t'};
+ var unescapes = {'\\/': '/', '\\\\': '\\', '\\n': '\n', '\\r': '\r', '\\t': '\t', '\\&':'&'};
function unescapeRegexReplace(str) {
var stream = new CodeMirror.StringStream(str);
var output = [];
@@ -4143,7 +4182,8 @@
}
function makePrompt(prefix, desc) {
var raw = '' +
- (prefix || "") + '';
+ (prefix || "") + '';
if (desc)
raw += ' ' + desc + '';
return raw;
@@ -4220,23 +4260,27 @@
query: query
};
}
+ var highlightTimeout = 0;
function highlightSearchMatches(cm, query) {
- var searchState = getSearchState(cm);
- var overlay = searchState.getOverlay();
- if (!overlay || query != overlay.query) {
- if (overlay) {
- cm.removeOverlay(overlay);
- }
- overlay = searchOverlay(query);
- cm.addOverlay(overlay);
- if (cm.showMatchesOnScrollbar) {
- if (searchState.getScrollbarAnnotate()) {
- searchState.getScrollbarAnnotate().clear();
+ clearTimeout(highlightTimeout);
+ highlightTimeout = setTimeout(function() {
+ var searchState = getSearchState(cm);
+ var overlay = searchState.getOverlay();
+ if (!overlay || query != overlay.query) {
+ if (overlay) {
+ cm.removeOverlay(overlay);
}
- searchState.setScrollbarAnnotate(cm.showMatchesOnScrollbar(query));
+ overlay = searchOverlay(query);
+ cm.addOverlay(overlay);
+ if (cm.showMatchesOnScrollbar) {
+ if (searchState.getScrollbarAnnotate()) {
+ searchState.getScrollbarAnnotate().clear();
+ }
+ searchState.setScrollbarAnnotate(cm.showMatchesOnScrollbar(query));
+ }
+ searchState.setOverlay(overlay);
}
- searchState.setOverlay(overlay);
- }
+ }, 50);
}
function findNext(cm, prev, query, repeat) {
if (repeat === undefined) { repeat = 1; }
@@ -4305,25 +4349,25 @@
}
function getMarkPos(cm, vim, markName) {
- if (markName == '\'') {
- var history = cm.doc.history.done;
- var event = history[history.length - 2];
- return event && event.ranges && event.ranges[0].head;
+ if (markName == '\'' || markName == '`') {
+ return vimGlobalState.jumpList.find(cm, -1) || Pos(0, 0);
} else if (markName == '.') {
- if (cm.doc.history.lastModTime == 0) {
- return // If no changes, bail out; don't bother to copy or reverse history array.
- } else {
- var changeHistory = cm.doc.history.done.filter(function(el){ if (el.changes !== undefined) { return el } });
- changeHistory.reverse();
- var lastEditPos = changeHistory[0].changes[0].to;
- }
- return lastEditPos;
+ return getLastEditPos(cm);
}
var mark = vim.marks[markName];
return mark && mark.find();
}
+ function getLastEditPos(cm) {
+ var done = cm.doc.history.done;
+ for (var i = done.length; i--;) {
+ if (done[i].changes) {
+ return copyCursor(done[i].changes[0].to);
+ }
+ }
+ }
+
var ExCommandDispatcher = function() {
this.buildCommandMap_();
};
@@ -4412,7 +4456,7 @@
}
// Parse command name.
- var commandMatch = inputStream.match(/^(\w+)/);
+ var commandMatch = inputStream.match(/^(\w+|!!|@@|[!#&*<=>@~])/);
if (commandMatch) {
result.commandName = commandMatch[1];
} else {
@@ -4848,6 +4892,9 @@
var global = false; // True to replace all instances on a line, false to replace only 1.
if (tokens.length) {
regexPart = tokens[0];
+ if (getOption('pcre') && regexPart !== '') {
+ regexPart = new RegExp(regexPart).source; //normalize not escaped characters
+ }
replacePart = tokens[1];
if (regexPart && regexPart[regexPart.length - 1] === '$') {
regexPart = regexPart.slice(0, regexPart.length - 1) + '\\n';
@@ -4855,7 +4902,7 @@
}
if (replacePart !== undefined) {
if (getOption('pcre')) {
- replacePart = unescapeRegexReplace(replacePart);
+ replacePart = unescapeRegexReplace(replacePart.replace(/([^\\])&/g,"$1$$&"));
} else {
replacePart = translateRegexReplace(replacePart);
}
@@ -4886,7 +4933,11 @@
global = true;
flagsPart.replace('g', '');
}
- regexPart = regexPart.replace(/\//g, "\\/") + '/' + flagsPart;
+ if (getOption('pcre')) {
+ regexPart = regexPart + '/' + flagsPart;
+ } else {
+ regexPart = regexPart.replace(/\//g, "\\/") + '/' + flagsPart;
+ }
}
}
if (regexPart) {
@@ -5303,14 +5354,34 @@
updateFakeCursor(cm);
}
}
+ /**
+ * Keeps track of a fake cursor to support visual mode cursor behavior.
+ */
function updateFakeCursor(cm) {
+ var className = 'cm-animate-fat-cursor';
var vim = cm.state.vim;
var from = clipCursorToContent(cm, copyCursor(vim.sel.head));
var to = offsetCursor(from, 0, 1);
+ clearFakeCursor(vim);
+ // In visual mode, the cursor may be positioned over EOL.
+ if (from.ch == cm.getLine(from.line).length) {
+ var widget = document.createElement("span");
+ widget.textContent = "\u00a0";
+ widget.className = className;
+ vim.fakeCursorBookmark = cm.setBookmark(from, {widget: widget});
+ } else {
+ vim.fakeCursor = cm.markText(from, to, {className: className});
+ }
+ }
+ function clearFakeCursor(vim) {
if (vim.fakeCursor) {
vim.fakeCursor.clear();
+ vim.fakeCursor = null;
+ }
+ if (vim.fakeCursorBookmark) {
+ vim.fakeCursorBookmark.clear();
+ vim.fakeCursorBookmark = null;
}
- vim.fakeCursor = cm.markText(from, to, {className: 'cm-animate-fat-cursor'});
}
function handleExternalSelection(cm, vim) {
var anchor = cm.getCursor('anchor');
@@ -5436,18 +5507,15 @@
return true;
}
var head = cm.getCursor('head');
- var inVisualBlock = vimGlobalState.macroModeState.lastInsertModeChanges.inVisualBlock;
- if (inVisualBlock) {
+ var visualBlock = vimGlobalState.macroModeState.lastInsertModeChanges.visualBlock;
+ if (visualBlock) {
// Set up block selection again for repeating the changes.
- var vim = cm.state.vim;
- var lastSel = vim.lastSelection;
- var offset = getOffset(lastSel.anchor, lastSel.head);
- selectForInsert(cm, head, offset.line + 1);
+ selectForInsert(cm, head, visualBlock + 1);
repeat = cm.listSelections().length;
cm.setCursor(head);
}
for (var i = 0; i < repeat; i++) {
- if (inVisualBlock) {
+ if (visualBlock) {
cm.setCursor(offsetCursor(head, i, 0));
}
for (var j = 0; j < changes.length; j++) {
@@ -5464,7 +5532,7 @@
}
}
}
- if (inVisualBlock) {
+ if (visualBlock) {
cm.setCursor(offsetCursor(head, 0, 1));
}
}
diff --git a/src/codemirror/lib/codemirror.css b/src/assets/plugins/codemirror/lib/codemirror.css
old mode 100755
new mode 100644
similarity index 94%
rename from src/codemirror/lib/codemirror.css
rename to src/assets/plugins/codemirror/lib/codemirror.css
index c7a8ae7..5689650
--- a/src/codemirror/lib/codemirror.css
+++ b/src/assets/plugins/codemirror/lib/codemirror.css
@@ -13,7 +13,8 @@
.CodeMirror-lines {
padding: 4px 0; /* Vertical padding around content */
}
-.CodeMirror pre {
+.CodeMirror pre.CodeMirror-line,
+.CodeMirror pre.CodeMirror-line-like {
padding: 0 4px; /* Horizontal padding of content */
}
@@ -96,7 +97,7 @@
.CodeMirror-rulers {
position: absolute;
- left: 0; right: 0; top: -50px; bottom: -20px;
+ left: 0; right: 0; top: -50px; bottom: 0;
overflow: hidden;
}
.CodeMirror-ruler {
@@ -163,17 +164,17 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
.CodeMirror-scroll {
overflow: scroll !important; /* Things will break if this is overridden */
- /* 30px is the magic margin used to hide the element's real scrollbars */
+ /* 50px is the magic margin used to hide the element's real scrollbars */
/* See overflow: hidden in .CodeMirror */
- margin-bottom: -30px; margin-right: -30px;
- padding-bottom: 30px;
+ margin-bottom: -50px; margin-right: -50px;
+ padding-bottom: 50px;
height: 100%;
outline: none; /* Prevent dragging from highlighting the element */
position: relative;
}
.CodeMirror-sizer {
position: relative;
- border-right: 30px solid transparent;
+ border-right: 50px solid transparent;
}
/* The fake, visible scrollbars. Used to force redraw during scrolling
@@ -211,7 +212,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
height: 100%;
display: inline-block;
vertical-align: top;
- margin-bottom: -30px;
+ margin-bottom: -50px;
}
.CodeMirror-gutter-wrapper {
position: absolute;
@@ -236,7 +237,8 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
cursor: text;
min-height: 1px; /* prevents collapsing before first draw */
}
-.CodeMirror pre {
+.CodeMirror pre.CodeMirror-line,
+.CodeMirror pre.CodeMirror-line-like {
/* Reset some styles that the rest of the page might have set */
-moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0;
border-width: 0;
@@ -255,7 +257,8 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
-webkit-font-variant-ligatures: contextual;
font-variant-ligatures: contextual;
}
-.CodeMirror-wrap pre {
+.CodeMirror-wrap pre.CodeMirror-line,
+.CodeMirror-wrap pre.CodeMirror-line-like {
word-wrap: break-word;
white-space: pre-wrap;
word-break: normal;
diff --git a/src/codemirror/lib/codemirror.js b/src/assets/plugins/codemirror/lib/codemirror.js
old mode 100755
new mode 100644
similarity index 98%
rename from src/codemirror/lib/codemirror.js
rename to src/assets/plugins/codemirror/lib/codemirror.js
index 6d8bd9f..375fa2a
--- a/src/codemirror/lib/codemirror.js
+++ b/src/assets/plugins/codemirror/lib/codemirror.js
@@ -173,10 +173,28 @@
}
}
- var Delayed = function() {this.id = null;};
+ var Delayed = function() {
+ this.id = null;
+ this.f = null;
+ this.time = 0;
+ this.handler = bind(this.onTimeout, this);
+ };
+ Delayed.prototype.onTimeout = function (self) {
+ self.id = 0;
+ if (self.time <= +new Date) {
+ self.f();
+ } else {
+ setTimeout(self.handler, self.time - +new Date);
+ }
+ };
Delayed.prototype.set = function (ms, f) {
- clearTimeout(this.id);
- this.id = setTimeout(f, ms);
+ this.f = f;
+ var time = +new Date + ms;
+ if (!this.id || time < this.time) {
+ clearTimeout(this.id);
+ this.id = setTimeout(this.handler, ms);
+ this.time = time;
+ }
};
function indexOf(array, elt) {
@@ -186,7 +204,7 @@
}
// Number of pixels added to scroller and sizer to hide scrollbar
- var scrollerGap = 30;
+ var scrollerGap = 50;
// Returned or thrown by various protocols to signal 'I'm not
// handling this'.
@@ -467,14 +485,15 @@
for (++i$7; i$7 < len && countsAsLeft.test(types[i$7]); ++i$7) {}
order.push(new BidiSpan(0, start, i$7));
} else {
- var pos = i$7, at = order.length;
+ var pos = i$7, at = order.length, isRTL = direction == "rtl" ? 1 : 0;
for (++i$7; i$7 < len && types[i$7] != "L"; ++i$7) {}
for (var j$2 = pos; j$2 < i$7;) {
if (countsAsNum.test(types[j$2])) {
- if (pos < j$2) { order.splice(at, 0, new BidiSpan(1, pos, j$2)); }
+ if (pos < j$2) { order.splice(at, 0, new BidiSpan(1, pos, j$2)); at += isRTL; }
var nstart = j$2;
for (++j$2; j$2 < i$7 && countsAsNum.test(types[j$2]); ++j$2) {}
order.splice(at, 0, new BidiSpan(2, nstart, j$2));
+ at += isRTL;
pos = j$2;
} else { ++j$2; }
}
@@ -1186,7 +1205,7 @@
var prop = lineClass[1] ? "bgClass" : "textClass";
if (output[prop] == null)
{ output[prop] = lineClass[2]; }
- else if (!(new RegExp("(?:^|\s)" + lineClass[2] + "(?:$|\s)")).test(output[prop]))
+ else if (!(new RegExp("(?:^|\\s)" + lineClass[2] + "(?:$|\\s)")).test(output[prop]))
{ output[prop] += " " + lineClass[2]; }
} }
return type
@@ -2191,10 +2210,10 @@
function updateLineWidgets(cm, lineView, dims) {
if (lineView.alignable) { lineView.alignable = null; }
+ var isWidget = classTest("CodeMirror-linewidget");
for (var node = lineView.node.firstChild, next = (void 0); node; node = next) {
next = node.nextSibling;
- if (node.className == "CodeMirror-linewidget")
- { lineView.node.removeChild(node); }
+ if (isWidget.test(node.className)) { lineView.node.removeChild(node); }
}
insertLineWidgets(cm, lineView, dims);
}
@@ -2224,7 +2243,7 @@
if (!line.widgets) { return }
var wrap = ensureLineWrapped(lineView);
for (var i = 0, ws = line.widgets; i < ws.length; ++i) {
- var widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget");
+ var widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget" + (widget.className ? " " + widget.className : ""));
if (!widget.handleMouseEvents) { node.setAttribute("cm-ignore-events", "true"); }
positionLineWidget(widget, node, lineView, dims);
cm.display.input.setUneditable(node);
@@ -2284,7 +2303,7 @@
function paddingVert(display) {return display.mover.offsetHeight - display.lineSpace.offsetHeight}
function paddingH(display) {
if (display.cachedPaddingH) { return display.cachedPaddingH }
- var e = removeChildrenAndAdd(display.measure, elt("pre", "x"));
+ var e = removeChildrenAndAdd(display.measure, elt("pre", "x", "CodeMirror-line-like"));
var style = window.getComputedStyle ? window.getComputedStyle(e) : e.currentStyle;
var data = {left: parseInt(style.paddingLeft), right: parseInt(style.paddingRight)};
if (!isNaN(data.left) && !isNaN(data.right)) { display.cachedPaddingH = data; }
@@ -2678,7 +2697,7 @@
function PosWithInfo(line, ch, sticky, outside, xRel) {
var pos = Pos(line, ch, sticky);
pos.xRel = xRel;
- if (outside) { pos.outside = true; }
+ if (outside) { pos.outside = outside; }
return pos
}
@@ -2687,16 +2706,16 @@
function coordsChar(cm, x, y) {
var doc = cm.doc;
y += cm.display.viewOffset;
- if (y < 0) { return PosWithInfo(doc.first, 0, null, true, -1) }
+ if (y < 0) { return PosWithInfo(doc.first, 0, null, -1, -1) }
var lineN = lineAtHeight(doc, y), last = doc.first + doc.size - 1;
if (lineN > last)
- { return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, null, true, 1) }
+ { return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, null, 1, 1) }
if (x < 0) { x = 0; }
var lineObj = getLine(doc, lineN);
for (;;) {
var found = coordsCharInner(cm, lineObj, lineN, x, y);
- var collapsed = collapsedSpanAround(lineObj, found.ch + (found.xRel > 0 ? 1 : 0));
+ var collapsed = collapsedSpanAround(lineObj, found.ch + (found.xRel > 0 || found.outside > 0 ? 1 : 0));
if (!collapsed) { return found }
var rangeEnd = collapsed.find(1);
if (rangeEnd.line == lineN) { return rangeEnd }
@@ -2784,7 +2803,7 @@
// base X position
var coords = cursorCoords(cm, Pos(lineNo$$1, ch, sticky), "line", lineObj, preparedMeasure);
baseX = coords.left;
- outside = y < coords.top || y >= coords.bottom;
+ outside = y < coords.top ? -1 : y >= coords.bottom ? 1 : 0;
}
ch = skipExtendingChars(lineObj.text, ch, 1);
@@ -2853,7 +2872,7 @@
function textHeight(display) {
if (display.cachedTextHeight != null) { return display.cachedTextHeight }
if (measureText == null) {
- measureText = elt("pre");
+ measureText = elt("pre", null, "CodeMirror-line-like");
// Measure a bunch of lines, for browsers that compute
// fractional heights.
for (var i = 0; i < 49; ++i) {
@@ -2873,7 +2892,7 @@
function charWidth(display) {
if (display.cachedCharWidth != null) { return display.cachedCharWidth }
var anchor = elt("span", "xxxxxxxxxx");
- var pre = elt("pre", [anchor]);
+ var pre = elt("pre", [anchor], "CodeMirror-line-like");
removeChildrenAndAdd(display.measure, pre);
var rect = anchor.getBoundingClientRect(), width = (rect.right - rect.left) / 10;
if (width > 2) { display.cachedCharWidth = width; }
@@ -2947,7 +2966,7 @@
try { x = e.clientX - space.left; y = e.clientY - space.top; }
catch (e) { return null }
var coords = coordsChar(cm, x, y), line;
- if (forRect && coords.xRel == 1 && (line = getLine(cm.doc, coords.line).text).length == coords.ch) {
+ if (forRect && coords.xRel > 0 && (line = getLine(cm.doc, coords.line).text).length == coords.ch) {
var colDiff = countColumn(line, line.length, cm.options.tabSize) - line.length;
coords = Pos(coords.line, Math.max(0, Math.round((x - paddingH(cm.display).left) / charWidth(cm.display)) - colDiff));
}
@@ -3536,7 +3555,7 @@
}
function setScrollTop(cm, val, forceScroll) {
- val = Math.min(cm.display.scroller.scrollHeight - cm.display.scroller.clientHeight, val);
+ val = Math.max(0, Math.min(cm.display.scroller.scrollHeight - cm.display.scroller.clientHeight, val));
if (cm.display.scroller.scrollTop == val && !forceScroll) { return }
cm.doc.scrollTop = val;
cm.display.scrollbars.setScrollTop(val);
@@ -3546,7 +3565,7 @@
// Sync scroller and scrollbar, ensure the gutter elements are
// aligned.
function setScrollLeft(cm, val, isScroller, forceScroll) {
- val = Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth);
+ val = Math.max(0, Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth));
if ((isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) && !forceScroll) { return }
cm.doc.scrollLeft = val;
alignHorizontally(cm);
@@ -4037,7 +4056,8 @@
function restoreSelection(snapshot) {
if (!snapshot || !snapshot.activeElt || snapshot.activeElt == activeElt()) { return }
snapshot.activeElt.focus();
- if (snapshot.anchorNode && contains(document.body, snapshot.anchorNode) && contains(document.body, snapshot.focusNode)) {
+ if (!/^(INPUT|TEXTAREA)$/.test(snapshot.activeElt.nodeName) &&
+ snapshot.anchorNode && contains(document.body, snapshot.anchorNode) && contains(document.body, snapshot.focusNode)) {
var sel = window.getSelection(), range$$1 = document.createRange();
range$$1.setEnd(snapshot.anchorNode, snapshot.anchorOffset);
range$$1.collapse(false);
@@ -4135,6 +4155,8 @@
update.visible = visibleLines(cm.display, cm.doc, viewport);
if (update.visible.from >= cm.display.viewFrom && update.visible.to <= cm.display.viewTo)
{ break }
+ } else if (first) {
+ update.visible = visibleLines(cm.display, cm.doc, viewport);
}
if (!updateDisplayIfNeeded(cm, update)) { break }
updateHeightsInViewport(cm);
@@ -5147,8 +5169,15 @@
var line = getLine(doc, pos.line);
if (line.markedSpans) { for (var i = 0; i < line.markedSpans.length; ++i) {
var sp = line.markedSpans[i], m = sp.marker;
- if ((sp.from == null || (m.inclusiveLeft ? sp.from <= pos.ch : sp.from < pos.ch)) &&
- (sp.to == null || (m.inclusiveRight ? sp.to >= pos.ch : sp.to > pos.ch))) {
+
+ // Determine if we should prevent the cursor being placed to the left/right of an atomic marker
+ // Historically this was determined using the inclusiveLeft/Right option, but the new way to control it
+ // is with selectLeft/Right
+ var preventCursorLeft = ("selectLeft" in m) ? !m.selectLeft : m.inclusiveLeft;
+ var preventCursorRight = ("selectRight" in m) ? !m.selectRight : m.inclusiveRight;
+
+ if ((sp.from == null || (preventCursorLeft ? sp.from <= pos.ch : sp.from < pos.ch)) &&
+ (sp.to == null || (preventCursorRight ? sp.to >= pos.ch : sp.to > pos.ch))) {
if (mayClear) {
signal(m, "beforeCursorEnter");
if (m.explicitlyCleared) {
@@ -5160,14 +5189,14 @@
if (oldPos) {
var near = m.find(dir < 0 ? 1 : -1), diff = (void 0);
- if (dir < 0 ? m.inclusiveRight : m.inclusiveLeft)
+ if (dir < 0 ? preventCursorRight : preventCursorLeft)
{ near = movePos(doc, near, -dir, near && near.line == pos.line ? line : null); }
if (near && near.line == pos.line && (diff = cmp(near, oldPos)) && (dir < 0 ? diff < 0 : diff > 0))
{ return skipAtomicInner(doc, near, pos, dir, mayClear) }
}
var far = m.find(dir < 0 ? -1 : 1);
- if (dir < 0 ? m.inclusiveLeft : m.inclusiveRight)
+ if (dir < 0 ? preventCursorLeft : preventCursorRight)
{ far = movePos(doc, far, dir, far.line == pos.line ? line : null); }
return far ? skipAtomicInner(doc, far, pos, dir, mayClear) : null
}
@@ -5396,6 +5425,9 @@
if (doc.cm) { makeChangeSingleDocInEditor(doc.cm, change, spans); }
else { updateDoc(doc, change, spans); }
setSelectionNoUndo(doc, selAfter, sel_dontScroll);
+
+ if (doc.cantEdit && skipAtomic(doc, Pos(doc.firstLine(), 0)))
+ { doc.cantEdit = false; }
}
// Handle the interaction of a change to a document with the editor
@@ -6257,7 +6289,12 @@
for (var i$1 = 0; i$1 < hist.undone.length; i$1++) { if (!hist.undone[i$1].ranges) { ++undone; } }
return {undo: done, redo: undone}
},
- clearHistory: function() {this.history = new History(this.history.maxGeneration);},
+ clearHistory: function() {
+ var this$1 = this;
+
+ this.history = new History(this.history.maxGeneration);
+ linkedDocs(this, function (doc) { return doc.history = this$1.history; }, true);
+ },
markClean: function() {
this.cleanGeneration = this.changeGeneration(true);
@@ -6510,28 +6547,39 @@
// and insert it.
if (files && files.length && window.FileReader && window.File) {
var n = files.length, text = Array(n), read = 0;
- var loadFile = function (file, i) {
- if (cm.options.allowDropFileTypes &&
- indexOf(cm.options.allowDropFileTypes, file.type) == -1)
- { return }
-
- var reader = new FileReader;
- reader.onload = operation(cm, function () {
- var content = reader.result;
- if (/[\x00-\x08\x0e-\x1f]{2}/.test(content)) { content = ""; }
- text[i] = content;
- if (++read == n) {
+ var markAsReadAndPasteIfAllFilesAreRead = function () {
+ if (++read == n) {
+ operation(cm, function () {
pos = clipPos(cm.doc, pos);
var change = {from: pos, to: pos,
- text: cm.doc.splitLines(text.join(cm.doc.lineSeparator())),
+ text: cm.doc.splitLines(
+ text.filter(function (t) { return t != null; }).join(cm.doc.lineSeparator())),
origin: "paste"};
makeChange(cm.doc, change);
- setSelectionReplaceHistory(cm.doc, simpleSelection(pos, changeEnd(change)));
+ setSelectionReplaceHistory(cm.doc, simpleSelection(clipPos(cm.doc, pos), clipPos(cm.doc, changeEnd(change))));
+ })();
+ }
+ };
+ var readTextFromFile = function (file, i) {
+ if (cm.options.allowDropFileTypes &&
+ indexOf(cm.options.allowDropFileTypes, file.type) == -1) {
+ markAsReadAndPasteIfAllFilesAreRead();
+ return
+ }
+ var reader = new FileReader;
+ reader.onerror = function () { return markAsReadAndPasteIfAllFilesAreRead(); };
+ reader.onload = function () {
+ var content = reader.result;
+ if (/[\x00-\x08\x0e-\x1f]{2}/.test(content)) {
+ markAsReadAndPasteIfAllFilesAreRead();
+ return
}
- });
+ text[i] = content;
+ markAsReadAndPasteIfAllFilesAreRead();
+ };
reader.readAsText(file);
};
- for (var i = 0; i < n; ++i) { loadFile(files[i], i); }
+ for (var i = 0; i < files.length; i++) { readTextFromFile(files[i], i); }
} else { // Normal drop
// Don't do a replace if the drop happened inside of the selected text.
if (cm.state.draggingText && cm.doc.sel.contains(pos) > -1) {
@@ -6841,6 +6889,7 @@
function endOfLine(visually, cm, lineObj, lineNo, dir) {
if (visually) {
+ if (cm.doc.direction == "rtl") { dir = -dir; }
var order = getOrder(lineObj, cm.doc.direction);
if (order) {
var part = dir < 0 ? lst(order) : order[0];
@@ -7095,7 +7144,7 @@
var line = getLine(cm.doc, start.line);
var order = getOrder(line, cm.doc.direction);
if (!order || order[0].level == 0) {
- var firstNonWS = Math.max(0, line.text.search(/\S/));
+ var firstNonWS = Math.max(start.ch, line.text.search(/\S/));
var inWS = pos.line == start.line && pos.ch <= firstNonWS && pos.ch;
return Pos(start.line, inWS ? 0 : firstNonWS, start.sticky)
}
@@ -7198,6 +7247,7 @@
var lastStoppedKey = null;
function onKeyDown(e) {
var cm = this;
+ if (e.target && e.target != cm.display.input.getField()) { return }
cm.curOp.focus = activeElt();
if (signalDOMEvent(cm, e)) { return }
// IE does strange things with escape.
@@ -7211,6 +7261,8 @@
if (!handled && code == 88 && !hasCopyEvent && (mac ? e.metaKey : e.ctrlKey))
{ cm.replaceSelection("", null, "cut"); }
}
+ if (gecko && !mac && !handled && code == 46 && e.shiftKey && !e.ctrlKey && document.execCommand)
+ { document.execCommand("cut"); }
// Turn mouse into crosshair when Alt is held on Mac.
if (code == 18 && !/\bCodeMirror-crosshair\b/.test(cm.display.lineDiv.className))
@@ -7239,6 +7291,7 @@
function onKeyPress(e) {
var cm = this;
+ if (e.target && e.target != cm.display.input.getField()) { return }
if (eventInWidget(cm.display, e) || signalDOMEvent(cm, e) || e.ctrlKey && !e.altKey || mac && e.metaKey) { return }
var keyCode = e.keyCode, charCode = e.charCode;
if (presto && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return}
@@ -7387,8 +7440,8 @@
if (!behavior.addNew)
{ extendSelection(cm.doc, pos, null, null, behavior.extend); }
// Work around unexplainable focus problem in IE9 (#2127) and Chrome (#3081)
- if (webkit || ie && ie_version == 9)
- { setTimeout(function () {display.wrapper.ownerDocument.body.focus(); display.input.focus();}, 20); }
+ if ((webkit && !safari) || ie && ie_version == 9)
+ { setTimeout(function () {display.wrapper.ownerDocument.body.focus({preventScroll: true}); display.input.focus();}, 20); }
else
{ display.input.focus(); }
}
@@ -7700,7 +7753,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-\u200f\u2028\u2029\ufeff]/g, function (cm, val, old) {
+ option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\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(); }
});
@@ -7764,6 +7817,12 @@
}
cm.display.input.readOnlyChanged(val);
});
+
+ option("screenReaderLabel", null, function (cm, val) {
+ val = (val === '') ? null : val;
+ cm.display.input.screenReaderLabelChanged(val);
+ });
+
option("disableInput", false, function (cm, val) {if (!val) { cm.display.input.reset(); }}, true);
option("dragDrop", true, dragDropChanged);
option("allowDropFileTypes", null);
@@ -7916,6 +7975,9 @@
// which point we can't mess with it anymore. Context menu is
// handled in onMouseDown for these browsers.
on(d.scroller, "contextmenu", function (e) { return onContextMenu(cm, e); });
+ on(d.input.getField(), "contextmenu", function (e) {
+ if (!d.scroller.contains(e.target)) { onContextMenu(cm, e); }
+ });
// Used to suppress mouse event handling when a touch happens
var touchFinished, prevTouch = {end: 0};
@@ -8602,7 +8664,7 @@
clearCaches(this);
scrollToCoords(this, this.doc.scrollLeft, this.doc.scrollTop);
updateGutterSpace(this.display);
- if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5)
+ if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5 || this.options.lineWrapping)
{ estimateLineHeights(this); }
signal(this, "refresh", this);
}),
@@ -8656,8 +8718,9 @@
var oldPos = pos;
var origDir = dir;
var lineObj = getLine(doc, pos.line);
+ var lineDir = visually && doc.direction == "rtl" ? -dir : dir;
function findNextLine() {
- var l = pos.line + dir;
+ var l = pos.line + lineDir;
if (l < doc.first || l >= doc.first + doc.size) { return false }
pos = new Pos(l, pos.ch, pos.sticky);
return lineObj = getLine(doc, l)
@@ -8671,7 +8734,7 @@
}
if (next == null) {
if (!boundToLine && findNextLine())
- { pos = endOfLine(visually, doc.cm, lineObj, pos.line, dir); }
+ { pos = endOfLine(visually, doc.cm, lineObj, pos.line, lineDir); }
else
{ return false }
} else {
@@ -8750,8 +8813,16 @@
var div = input.div = display.lineDiv;
disableBrowserMagic(div, cm.options.spellcheck, cm.options.autocorrect, cm.options.autocapitalize);
+ function belongsToInput(e) {
+ for (var t = e.target; t; t = t.parentNode) {
+ if (t == div) { return true }
+ if (/\bCodeMirror-(?:line)?widget\b/.test(t.className)) { break }
+ }
+ return false
+ }
+
on(div, "paste", function (e) {
- if (signalDOMEvent(cm, e) || handlePaste(e, cm)) { return }
+ if (!belongsToInput(e) || signalDOMEvent(cm, e) || handlePaste(e, cm)) { return }
// IE doesn't fire input events, so we schedule a read for the pasted content in this way
if (ie_version <= 11) { setTimeout(operation(cm, function () { return this$1.updateFromDOM(); }), 20); }
});
@@ -8776,7 +8847,7 @@
});
function onCopyCut(e) {
- if (signalDOMEvent(cm, e)) { return }
+ if (!belongsToInput(e) || signalDOMEvent(cm, e)) { return }
if (cm.somethingSelected()) {
setLastCopied({lineWise: false, text: cm.getSelections()});
if (e.type == "cut") { cm.replaceSelection("", null, "cut"); }
@@ -8818,9 +8889,18 @@
on(div, "cut", onCopyCut);
};
+ ContentEditableInput.prototype.screenReaderLabelChanged = function (label) {
+ // Label for screenreaders, accessibility
+ if(label) {
+ this.div.setAttribute('aria-label', label);
+ } else {
+ this.div.removeAttribute('aria-label');
+ }
+ };
+
ContentEditableInput.prototype.prepareSelection = function () {
var result = prepareSelection(this.cm, false);
- result.focus = this.cm.state.focused;
+ result.focus = document.activeElement == this.div;
return result
};
@@ -8916,7 +8996,7 @@
ContentEditableInput.prototype.focus = function () {
if (this.cm.options.readOnly != "nocursor") {
- if (!this.selectionInEditor())
+ if (!this.selectionInEditor() || document.activeElement != this.div)
{ this.showSelection(this.prepareSelection(), true); }
this.div.focus();
}
@@ -9358,6 +9438,15 @@
this.textarea = this.wrapper.firstChild;
};
+ TextareaInput.prototype.screenReaderLabelChanged = function (label) {
+ // Label for screenreaders, accessibility
+ if(label) {
+ this.textarea.setAttribute('aria-label', label);
+ } else {
+ this.textarea.removeAttribute('aria-label');
+ }
+ };
+
TextareaInput.prototype.prepareSelection = function () {
// Redraw the selection and/or cursor
var cm = this.cm, display = cm.display, doc = cm.doc;
@@ -9649,7 +9738,7 @@
textarea.style.display = "";
if (textarea.form) {
off(textarea.form, "submit", save);
- if (typeof textarea.form.submit == "function")
+ if (!options.leaveSubmitMethodAlone && typeof textarea.form.submit == "function")
{ textarea.form.submit = realSubmit; }
}
};
@@ -9748,7 +9837,7 @@
addLegacyProps(CodeMirror);
- CodeMirror.version = "5.46.0";
+ CodeMirror.version = "5.54.0";
return CodeMirror;
diff --git a/src/codemirror/mode/clike/clike.js b/src/assets/plugins/codemirror/mode/clike/clike.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/clike/clike.js
rename to src/assets/plugins/codemirror/mode/clike/clike.js
diff --git a/src/codemirror/mode/clike/index.html b/src/assets/plugins/codemirror/mode/clike/index.html
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/clike/index.html
rename to src/assets/plugins/codemirror/mode/clike/index.html
diff --git a/src/codemirror/mode/clike/scala.html b/src/assets/plugins/codemirror/mode/clike/scala.html
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/clike/scala.html
rename to src/assets/plugins/codemirror/mode/clike/scala.html
diff --git a/src/codemirror/mode/clike/test.js b/src/assets/plugins/codemirror/mode/clike/test.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/clike/test.js
rename to src/assets/plugins/codemirror/mode/clike/test.js
diff --git a/src/assets/plugins/codemirror/mode/coffeescript/coffeescript.js b/src/assets/plugins/codemirror/mode/coffeescript/coffeescript.js
new file mode 100644
index 0000000..a54e9d5
--- /dev/null
+++ b/src/assets/plugins/codemirror/mode/coffeescript/coffeescript.js
@@ -0,0 +1,359 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+/**
+ * Link to the project's GitHub page:
+ * https://github.com/pickhardt/coffeescript-codemirror-mode
+ */
+(function(mod) {
+ if (typeof exports == "object" && typeof module == "object") // CommonJS
+ mod(require("../../lib/codemirror"));
+ else if (typeof define == "function" && define.amd) // AMD
+ define(["../../lib/codemirror"], mod);
+ else // Plain browser env
+ mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("coffeescript", function(conf, parserConf) {
+ var ERRORCLASS = "error";
+
+ function wordRegexp(words) {
+ return new RegExp("^((" + words.join(")|(") + "))\\b");
+ }
+
+ var operators = /^(?:->|=>|\+[+=]?|-[\-=]?|\*[\*=]?|\/[\/=]?|[=!]=|<[><]?=?|>>?=?|%=?|&=?|\|=?|\^=?|\~|!|\?|(or|and|\|\||&&|\?)=)/;
+ var delimiters = /^(?:[()\[\]{},:`=;]|\.\.?\.?)/;
+ var identifiers = /^[_A-Za-z$][_A-Za-z$0-9]*/;
+ var atProp = /^@[_A-Za-z$][_A-Za-z$0-9]*/;
+
+ var wordOperators = wordRegexp(["and", "or", "not",
+ "is", "isnt", "in",
+ "instanceof", "typeof"]);
+ var indentKeywords = ["for", "while", "loop", "if", "unless", "else",
+ "switch", "try", "catch", "finally", "class"];
+ var commonKeywords = ["break", "by", "continue", "debugger", "delete",
+ "do", "in", "of", "new", "return", "then",
+ "this", "@", "throw", "when", "until", "extends"];
+
+ var keywords = wordRegexp(indentKeywords.concat(commonKeywords));
+
+ indentKeywords = wordRegexp(indentKeywords);
+
+
+ var stringPrefixes = /^('{3}|\"{3}|['\"])/;
+ var regexPrefixes = /^(\/{3}|\/)/;
+ var commonConstants = ["Infinity", "NaN", "undefined", "null", "true", "false", "on", "off", "yes", "no"];
+ var constants = wordRegexp(commonConstants);
+
+ // Tokenizers
+ function tokenBase(stream, state) {
+ // Handle scope changes
+ if (stream.sol()) {
+ if (state.scope.align === null) state.scope.align = false;
+ var scopeOffset = state.scope.offset;
+ if (stream.eatSpace()) {
+ var lineOffset = stream.indentation();
+ if (lineOffset > scopeOffset && state.scope.type == "coffee") {
+ return "indent";
+ } else if (lineOffset < scopeOffset) {
+ return "dedent";
+ }
+ return null;
+ } else {
+ if (scopeOffset > 0) {
+ dedent(stream, state);
+ }
+ }
+ }
+ if (stream.eatSpace()) {
+ return null;
+ }
+
+ var ch = stream.peek();
+
+ // Handle docco title comment (single line)
+ if (stream.match("####")) {
+ stream.skipToEnd();
+ return "comment";
+ }
+
+ // Handle multi line comments
+ if (stream.match("###")) {
+ state.tokenize = longComment;
+ return state.tokenize(stream, state);
+ }
+
+ // Single line comment
+ if (ch === "#") {
+ stream.skipToEnd();
+ return "comment";
+ }
+
+ // Handle number literals
+ if (stream.match(/^-?[0-9\.]/, false)) {
+ var floatLiteral = false;
+ // Floats
+ if (stream.match(/^-?\d*\.\d+(e[\+\-]?\d+)?/i)) {
+ floatLiteral = true;
+ }
+ if (stream.match(/^-?\d+\.\d*/)) {
+ floatLiteral = true;
+ }
+ if (stream.match(/^-?\.\d+/)) {
+ floatLiteral = true;
+ }
+
+ if (floatLiteral) {
+ // prevent from getting extra . on 1..
+ if (stream.peek() == "."){
+ stream.backUp(1);
+ }
+ return "number";
+ }
+ // Integers
+ var intLiteral = false;
+ // Hex
+ if (stream.match(/^-?0x[0-9a-f]+/i)) {
+ intLiteral = true;
+ }
+ // Decimal
+ if (stream.match(/^-?[1-9]\d*(e[\+\-]?\d+)?/)) {
+ intLiteral = true;
+ }
+ // Zero by itself with no other piece of number.
+ if (stream.match(/^-?0(?![\dx])/i)) {
+ intLiteral = true;
+ }
+ if (intLiteral) {
+ return "number";
+ }
+ }
+
+ // Handle strings
+ if (stream.match(stringPrefixes)) {
+ state.tokenize = tokenFactory(stream.current(), false, "string");
+ return state.tokenize(stream, state);
+ }
+ // Handle regex literals
+ if (stream.match(regexPrefixes)) {
+ if (stream.current() != "/" || stream.match(/^.*\//, false)) { // prevent highlight of division
+ state.tokenize = tokenFactory(stream.current(), true, "string-2");
+ return state.tokenize(stream, state);
+ } else {
+ stream.backUp(1);
+ }
+ }
+
+
+
+ // Handle operators and delimiters
+ if (stream.match(operators) || stream.match(wordOperators)) {
+ return "operator";
+ }
+ if (stream.match(delimiters)) {
+ return "punctuation";
+ }
+
+ if (stream.match(constants)) {
+ return "atom";
+ }
+
+ if (stream.match(atProp) || state.prop && stream.match(identifiers)) {
+ return "property";
+ }
+
+ if (stream.match(keywords)) {
+ return "keyword";
+ }
+
+ if (stream.match(identifiers)) {
+ return "variable";
+ }
+
+ // Handle non-detected items
+ stream.next();
+ return ERRORCLASS;
+ }
+
+ function tokenFactory(delimiter, singleline, outclass) {
+ return function(stream, state) {
+ while (!stream.eol()) {
+ stream.eatWhile(/[^'"\/\\]/);
+ if (stream.eat("\\")) {
+ stream.next();
+ if (singleline && stream.eol()) {
+ return outclass;
+ }
+ } else if (stream.match(delimiter)) {
+ state.tokenize = tokenBase;
+ return outclass;
+ } else {
+ stream.eat(/['"\/]/);
+ }
+ }
+ if (singleline) {
+ if (parserConf.singleLineStringErrors) {
+ outclass = ERRORCLASS;
+ } else {
+ state.tokenize = tokenBase;
+ }
+ }
+ return outclass;
+ };
+ }
+
+ function longComment(stream, state) {
+ while (!stream.eol()) {
+ stream.eatWhile(/[^#]/);
+ if (stream.match("###")) {
+ state.tokenize = tokenBase;
+ break;
+ }
+ stream.eatWhile("#");
+ }
+ return "comment";
+ }
+
+ function indent(stream, state, type) {
+ type = type || "coffee";
+ var offset = 0, align = false, alignOffset = null;
+ for (var scope = state.scope; scope; scope = scope.prev) {
+ if (scope.type === "coffee" || scope.type == "}") {
+ offset = scope.offset + conf.indentUnit;
+ break;
+ }
+ }
+ if (type !== "coffee") {
+ align = null;
+ alignOffset = stream.column() + stream.current().length;
+ } else if (state.scope.align) {
+ state.scope.align = false;
+ }
+ state.scope = {
+ offset: offset,
+ type: type,
+ prev: state.scope,
+ align: align,
+ alignOffset: alignOffset
+ };
+ }
+
+ function dedent(stream, state) {
+ if (!state.scope.prev) return;
+ if (state.scope.type === "coffee") {
+ var _indent = stream.indentation();
+ var matched = false;
+ for (var scope = state.scope; scope; scope = scope.prev) {
+ if (_indent === scope.offset) {
+ matched = true;
+ break;
+ }
+ }
+ if (!matched) {
+ return true;
+ }
+ while (state.scope.prev && state.scope.offset !== _indent) {
+ state.scope = state.scope.prev;
+ }
+ return false;
+ } else {
+ state.scope = state.scope.prev;
+ return false;
+ }
+ }
+
+ function tokenLexer(stream, state) {
+ var style = state.tokenize(stream, state);
+ var current = stream.current();
+
+ // Handle scope changes.
+ if (current === "return") {
+ state.dedent = true;
+ }
+ if (((current === "->" || current === "=>") && stream.eol())
+ || style === "indent") {
+ indent(stream, state);
+ }
+ var delimiter_index = "[({".indexOf(current);
+ if (delimiter_index !== -1) {
+ indent(stream, state, "])}".slice(delimiter_index, delimiter_index+1));
+ }
+ if (indentKeywords.exec(current)){
+ indent(stream, state);
+ }
+ if (current == "then"){
+ dedent(stream, state);
+ }
+
+
+ if (style === "dedent") {
+ if (dedent(stream, state)) {
+ return ERRORCLASS;
+ }
+ }
+ delimiter_index = "])}".indexOf(current);
+ if (delimiter_index !== -1) {
+ while (state.scope.type == "coffee" && state.scope.prev)
+ state.scope = state.scope.prev;
+ if (state.scope.type == current)
+ state.scope = state.scope.prev;
+ }
+ if (state.dedent && stream.eol()) {
+ if (state.scope.type == "coffee" && state.scope.prev)
+ state.scope = state.scope.prev;
+ state.dedent = false;
+ }
+
+ return style;
+ }
+
+ var external = {
+ startState: function(basecolumn) {
+ return {
+ tokenize: tokenBase,
+ scope: {offset:basecolumn || 0, type:"coffee", prev: null, align: false},
+ prop: false,
+ dedent: 0
+ };
+ },
+
+ token: function(stream, state) {
+ var fillAlign = state.scope.align === null && state.scope;
+ if (fillAlign && stream.sol()) fillAlign.align = false;
+
+ var style = tokenLexer(stream, state);
+ if (style && style != "comment") {
+ if (fillAlign) fillAlign.align = true;
+ state.prop = style == "punctuation" && stream.current() == "."
+ }
+
+ return style;
+ },
+
+ indent: function(state, text) {
+ if (state.tokenize != tokenBase) return 0;
+ var scope = state.scope;
+ var closer = text && "])}".indexOf(text.charAt(0)) > -1;
+ if (closer) while (scope.type == "coffee" && scope.prev) scope = scope.prev;
+ var closes = closer && scope.type === text.charAt(0);
+ if (scope.align)
+ return scope.alignOffset - (closes ? 1 : 0);
+ else
+ return (closes ? scope.prev : scope).offset;
+ },
+
+ lineComment: "#",
+ fold: "indent"
+ };
+ 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/src/assets/plugins/codemirror/mode/coffeescript/index.html b/src/assets/plugins/codemirror/mode/coffeescript/index.html
new file mode 100644
index 0000000..6d51aab
--- /dev/null
+++ b/src/assets/plugins/codemirror/mode/coffeescript/index.html
@@ -0,0 +1,740 @@
+
+
+CodeMirror: CoffeeScript mode
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/codemirror/mode/css/css.js b/src/assets/plugins/codemirror/mode/css/css.js
old mode 100755
new mode 100644
similarity index 80%
rename from src/codemirror/mode/css/css.js
rename to src/assets/plugins/codemirror/mode/css/css.js
index 05742c5..441ba4a
--- a/src/codemirror/mode/css/css.js
+++ b/src/assets/plugins/codemirror/mode/css/css.js
@@ -455,81 +455,98 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
"alignment-baseline", "anchor-point", "animation", "animation-delay",
"animation-direction", "animation-duration", "animation-fill-mode",
"animation-iteration-count", "animation-name", "animation-play-state",
- "animation-timing-function", "appearance", "azimuth", "backface-visibility",
- "background", "background-attachment", "background-blend-mode", "background-clip",
- "background-color", "background-image", "background-origin", "background-position",
- "background-repeat", "background-size", "baseline-shift", "binding",
- "bleed", "bookmark-label", "bookmark-level", "bookmark-state",
- "bookmark-target", "border", "border-bottom", "border-bottom-color",
- "border-bottom-left-radius", "border-bottom-right-radius",
- "border-bottom-style", "border-bottom-width", "border-collapse",
- "border-color", "border-image", "border-image-outset",
+ "animation-timing-function", "appearance", "azimuth", "backdrop-filter",
+ "backface-visibility", "background", "background-attachment",
+ "background-blend-mode", "background-clip", "background-color",
+ "background-image", "background-origin", "background-position",
+ "background-position-x", "background-position-y", "background-repeat",
+ "background-size", "baseline-shift", "binding", "bleed", "block-size",
+ "bookmark-label", "bookmark-level", "bookmark-state", "bookmark-target",
+ "border", "border-bottom", "border-bottom-color", "border-bottom-left-radius",
+ "border-bottom-right-radius", "border-bottom-style", "border-bottom-width",
+ "border-collapse", "border-color", "border-image", "border-image-outset",
"border-image-repeat", "border-image-slice", "border-image-source",
- "border-image-width", "border-left", "border-left-color",
- "border-left-style", "border-left-width", "border-radius", "border-right",
- "border-right-color", "border-right-style", "border-right-width",
- "border-spacing", "border-style", "border-top", "border-top-color",
- "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", "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",
- "cue-after", "cue-before", "cursor", "direction", "display",
- "dominant-baseline", "drop-initial-after-adjust",
- "drop-initial-after-align", "drop-initial-before-adjust",
- "drop-initial-before-align", "drop-initial-size", "drop-initial-value",
- "elevation", "empty-cells", "fit", "fit-position", "flex", "flex-basis",
- "flex-direction", "flex-flow", "flex-grow", "flex-shrink", "flex-wrap",
- "float", "float-offset", "flow-from", "flow-into", "font", "font-feature-settings",
- "font-family", "font-kerning", "font-language-override", "font-size", "font-size-adjust",
- "font-stretch", "font-style", "font-synthesis", "font-variant",
- "font-variant-alternates", "font-variant-caps", "font-variant-east-asian",
- "font-variant-ligatures", "font-variant-numeric", "font-variant-position",
- "font-weight", "grid", "grid-area", "grid-auto-columns", "grid-auto-flow",
- "grid-auto-rows", "grid-column", "grid-column-end", "grid-column-gap",
- "grid-column-start", "grid-gap", "grid-row", "grid-row-end", "grid-row-gap",
- "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", "justify-items", "justify-self", "left", "letter-spacing",
- "line-break", "line-height", "line-stacking", "line-stacking-ruby",
+ "border-image-width", "border-left", "border-left-color", "border-left-style",
+ "border-left-width", "border-radius", "border-right", "border-right-color",
+ "border-right-style", "border-right-width", "border-spacing", "border-style",
+ "border-top", "border-top-color", "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", "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", "contain",
+ "content", "counter-increment", "counter-reset", "crop", "cue", "cue-after",
+ "cue-before", "cursor", "direction", "display", "dominant-baseline",
+ "drop-initial-after-adjust", "drop-initial-after-align",
+ "drop-initial-before-adjust", "drop-initial-before-align", "drop-initial-size",
+ "drop-initial-value", "elevation", "empty-cells", "fit", "fit-position",
+ "flex", "flex-basis", "flex-direction", "flex-flow", "flex-grow",
+ "flex-shrink", "flex-wrap", "float", "float-offset", "flow-from", "flow-into",
+ "font", "font-family", "font-feature-settings", "font-kerning",
+ "font-language-override", "font-optical-sizing", "font-size",
+ "font-size-adjust", "font-stretch", "font-style", "font-synthesis",
+ "font-variant", "font-variant-alternates", "font-variant-caps",
+ "font-variant-east-asian", "font-variant-ligatures", "font-variant-numeric",
+ "font-variant-position", "font-variation-settings", "font-weight", "gap",
+ "grid", "grid-area", "grid-auto-columns", "grid-auto-flow", "grid-auto-rows",
+ "grid-column", "grid-column-end", "grid-column-gap", "grid-column-start",
+ "grid-gap", "grid-row", "grid-row-end", "grid-row-gap", "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",
+ "inset", "inset-block", "inset-block-end", "inset-block-start", "inset-inline",
+ "inset-inline-end", "inset-inline-start", "isolation", "justify-content",
+ "justify-items", "justify-self", "left", "letter-spacing", "line-break",
+ "line-height", "line-height-step", "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",
- "marks", "marquee-direction", "marquee-loop",
- "marquee-play-count", "marquee-speed", "marquee-style", "max-height",
- "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",
- "overflow", "overflow-style", "overflow-wrap", "overflow-x", "overflow-y",
- "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", "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",
- "right", "rotation", "rotation-point", "ruby-align", "ruby-overhang",
- "ruby-position", "ruby-span", "shape-image-threshold", "shape-inside", "shape-margin",
- "shape-outside", "size", "speak", "speak-as", "speak-header",
- "speak-numeral", "speak-punctuation", "speech-rate", "stress", "string-set",
- "tab-size", "table-layout", "target", "target-name", "target-new",
- "target-position", "text-align", "text-align-last", "text-decoration",
+ "margin-bottom", "margin-left", "margin-right", "margin-top", "marks",
+ "marquee-direction", "marquee-loop", "marquee-play-count", "marquee-speed",
+ "marquee-style", "max-block-size", "max-height", "max-inline-size",
+ "max-width", "min-block-size", "min-height", "min-inline-size", "min-width",
+ "mix-blend-mode", "move-to", "nav-down", "nav-index", "nav-left", "nav-right",
+ "nav-up", "object-fit", "object-position", "offset", "offset-anchor",
+ "offset-distance", "offset-path", "offset-position", "offset-rotate",
+ "opacity", "order", "orphans", "outline", "outline-color", "outline-offset",
+ "outline-style", "outline-width", "overflow", "overflow-style",
+ "overflow-wrap", "overflow-x", "overflow-y", "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", "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", "right", "rotate", "rotation", "rotation-point",
+ "row-gap", "ruby-align", "ruby-overhang", "ruby-position", "ruby-span",
+ "scale", "scroll-behavior", "scroll-margin", "scroll-margin-block",
+ "scroll-margin-block-end", "scroll-margin-block-start", "scroll-margin-bottom",
+ "scroll-margin-inline", "scroll-margin-inline-end",
+ "scroll-margin-inline-start", "scroll-margin-left", "scroll-margin-right",
+ "scroll-margin-top", "scroll-padding", "scroll-padding-block",
+ "scroll-padding-block-end", "scroll-padding-block-start",
+ "scroll-padding-bottom", "scroll-padding-inline", "scroll-padding-inline-end",
+ "scroll-padding-inline-start", "scroll-padding-left", "scroll-padding-right",
+ "scroll-padding-top", "scroll-snap-align", "scroll-snap-type",
+ "shape-image-threshold", "shape-inside", "shape-margin", "shape-outside",
+ "size", "speak", "speak-as", "speak-header", "speak-numeral",
+ "speak-punctuation", "speech-rate", "stress", "string-set", "tab-size",
+ "table-layout", "target", "target-name", "target-new", "target-position",
+ "text-align", "text-align-last", "text-combine-upright", "text-decoration",
"text-decoration-color", "text-decoration-line", "text-decoration-skip",
- "text-decoration-style", "text-emphasis", "text-emphasis-color",
- "text-emphasis-position", "text-emphasis-style", "text-height",
- "text-indent", "text-justify", "text-outline", "text-overflow", "text-shadow",
- "text-size-adjust", "text-space-collapse", "text-transform", "text-underline-position",
- "text-wrap", "top", "transform", "transform-origin", "transform-style",
- "transition", "transition-delay", "transition-duration",
- "transition-property", "transition-timing-function", "unicode-bidi",
- "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", "will-change", "word-break",
- "word-spacing", "word-wrap", "z-index",
+ "text-decoration-skip-ink", "text-decoration-style", "text-emphasis",
+ "text-emphasis-color", "text-emphasis-position", "text-emphasis-style",
+ "text-height", "text-indent", "text-justify", "text-orientation",
+ "text-outline", "text-overflow", "text-rendering", "text-shadow",
+ "text-size-adjust", "text-space-collapse", "text-transform",
+ "text-underline-position", "text-wrap", "top", "transform", "transform-origin",
+ "transform-style", "transition", "transition-delay", "transition-duration",
+ "transition-property", "transition-timing-function", "translate",
+ "unicode-bidi", "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",
+ "will-change", "word-break", "word-spacing", "word-wrap", "writing-mode", "z-index",
// SVG-specific
"clip-path", "clip-rule", "mask", "enable-background", "filter", "flood-color",
"flood-opacity", "lighting-color", "stop-color", "stop-opacity", "pointer-events",
@@ -543,16 +560,28 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
], propertyKeywords = keySet(propertyKeywords_);
var nonStandardPropertyKeywords_ = [
+ "border-block", "border-block-color", "border-block-end",
+ "border-block-end-color", "border-block-end-style", "border-block-end-width",
+ "border-block-start", "border-block-start-color", "border-block-start-style",
+ "border-block-start-width", "border-block-style", "border-block-width",
+ "border-inline", "border-inline-color", "border-inline-end",
+ "border-inline-end-color", "border-inline-end-style",
+ "border-inline-end-width", "border-inline-start", "border-inline-start-color",
+ "border-inline-start-style", "border-inline-start-width",
+ "border-inline-style", "border-inline-width", "margin-block",
+ "margin-block-end", "margin-block-start", "margin-inline", "margin-inline-end",
+ "margin-inline-start", "padding-block", "padding-block-end",
+ "padding-block-start", "padding-inline", "padding-inline-end",
+ "padding-inline-start", "scroll-snap-stop", "scrollbar-3d-light-color",
"scrollbar-arrow-color", "scrollbar-base-color", "scrollbar-dark-shadow-color",
"scrollbar-face-color", "scrollbar-highlight-color", "scrollbar-shadow-color",
- "scrollbar-3d-light-color", "scrollbar-track-color", "shape-inside",
- "searchfield-cancel-button", "searchfield-decoration", "searchfield-results-button",
- "searchfield-results-decoration", "zoom"
+ "scrollbar-track-color", "searchfield-cancel-button", "searchfield-decoration",
+ "searchfield-results-button", "searchfield-results-decoration", "shape-inside", "zoom"
], nonStandardPropertyKeywords = keySet(nonStandardPropertyKeywords_);
var fontProperties_ = [
- "font-family", "src", "unicode-range", "font-variant", "font-feature-settings",
- "font-stretch", "font-weight", "font-style"
+ "font-display", "font-family", "src", "unicode-range", "font-variant",
+ "font-feature-settings", "font-stretch", "font-weight", "font-style"
], fontProperties = keySet(fontProperties_);
var counterDescriptors_ = [
diff --git a/src/codemirror/mode/css/gss.html b/src/assets/plugins/codemirror/mode/css/gss.html
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/css/gss.html
rename to src/assets/plugins/codemirror/mode/css/gss.html
diff --git a/src/codemirror/mode/css/gss_test.js b/src/assets/plugins/codemirror/mode/css/gss_test.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/css/gss_test.js
rename to src/assets/plugins/codemirror/mode/css/gss_test.js
diff --git a/src/codemirror/mode/css/index.html b/src/assets/plugins/codemirror/mode/css/index.html
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/css/index.html
rename to src/assets/plugins/codemirror/mode/css/index.html
diff --git a/src/codemirror/mode/css/less.html b/src/assets/plugins/codemirror/mode/css/less.html
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/css/less.html
rename to src/assets/plugins/codemirror/mode/css/less.html
diff --git a/src/codemirror/mode/css/less_test.js b/src/assets/plugins/codemirror/mode/css/less_test.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/css/less_test.js
rename to src/assets/plugins/codemirror/mode/css/less_test.js
diff --git a/src/codemirror/mode/css/scss.html b/src/assets/plugins/codemirror/mode/css/scss.html
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/css/scss.html
rename to src/assets/plugins/codemirror/mode/css/scss.html
diff --git a/src/codemirror/mode/css/scss_test.js b/src/assets/plugins/codemirror/mode/css/scss_test.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/css/scss_test.js
rename to src/assets/plugins/codemirror/mode/css/scss_test.js
diff --git a/src/codemirror/mode/css/test.js b/src/assets/plugins/codemirror/mode/css/test.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/css/test.js
rename to src/assets/plugins/codemirror/mode/css/test.js
diff --git a/src/codemirror/mode/go/go.js b/src/assets/plugins/codemirror/mode/go/go.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/codemirror/mode/go/go.js
rename to src/assets/plugins/codemirror/mode/go/go.js
diff --git a/src/codemirror/mode/go/index.html b/src/assets/plugins/codemirror/mode/go/index.html
old mode 100755
new mode 100644
similarity index 98%
rename from src/codemirror/mode/go/index.html
rename to src/assets/plugins/codemirror/mode/go/index.html
index 4489211..10ec024
--- a/src/codemirror/mode/go/index.html
+++ b/src/assets/plugins/codemirror/mode/go/index.html
@@ -11,7 +11,7 @@
+ Get the current version: 5.54.0.
You can see the code,
read the release notes,
or study the user manual. @@ -195,4 +195,19 @@ pretty well. +
Sponsors
+These companies support development of this project:
+-
+
-
+
CodeMirror
+ CodeMirror