diff --git a/acf-code-field.php b/acf-code-field.php
index e434835..470e8d2 100644
--- a/acf-code-field.php
+++ b/acf-code-field.php
@@ -15,7 +15,7 @@
// Reference: https://codex.wordpress.org/Function_Reference/load_plugin_textdomain
load_plugin_textdomain( 'acf-code-field', false, dirname( plugin_basename( __FILE__ ) ) . '/lang/' );
-define( 'ACFCF_CODEMIRROR_VERSION', 'codemirror-5.23.0' );
+define( 'ACFCF_CODEMIRROR_VERSION', 'codemirror-5.39.0' );
define( 'ACFCF_PLUGIN_DIR', dirname( __FILE__ ) );
include_once( 'lib/class.acf-code-field-util.php' );
diff --git a/js/codemirror-5.23.0/.gitattributes b/js/codemirror-5.23.0/.gitattributes
deleted file mode 100644
index f8bdd60..0000000
--- a/js/codemirror-5.23.0/.gitattributes
+++ /dev/null
@@ -1,8 +0,0 @@
-*.txt text
-*.js text
-*.html text
-*.md text
-*.json text
-*.yml text
-*.css text
-*.svg text
diff --git a/js/codemirror-5.23.0/addon/edit/continuelist.js b/js/codemirror-5.23.0/addon/edit/continuelist.js
deleted file mode 100644
index 6574ea3..0000000
--- a/js/codemirror-5.23.0/addon/edit/continuelist.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(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";
-
- var listRE = /^(\s*)(>[> ]*|- \[[x ]\]\s|[*+-]\s|(\d+)([.)]))(\s*)/,
- emptyListRE = /^(\s*)(>[> ]*|- \[[x ]\]|[*+-]|(\d+)[.)])(\s*)$/,
- unorderedListRE = /[*+-]\s/;
-
- CodeMirror.commands.newlineAndIndentContinueMarkdownList = function(cm) {
- if (cm.getOption("disableInput")) return CodeMirror.Pass;
- var ranges = cm.listSelections(), replacements = [];
- for (var i = 0; i < ranges.length; i++) {
- var pos = ranges[i].head;
- var eolState = cm.getStateAfter(pos.line);
- var inList = eolState.list !== false;
- var inQuote = eolState.quote !== 0;
-
- var line = cm.getLine(pos.line), match = listRE.exec(line);
- if (!ranges[i].empty() || (!inList && !inQuote) || !match) {
- cm.execCommand("newlineAndIndent");
- return;
- }
- if (emptyListRE.test(line)) {
- cm.replaceRange("", {
- line: pos.line, ch: 0
- }, {
- line: pos.line, ch: pos.ch + 1
- });
- replacements[i] = "\n";
- } else {
- var indent = match[1], after = match[5];
- var bullet = unorderedListRE.test(match[2]) || match[2].indexOf(">") >= 0
- ? match[2].replace("x", " ")
- : (parseInt(match[3], 10) + 1) + match[4];
-
- replacements[i] = "\n" + indent + bullet + after;
- }
- }
-
- cm.replaceSelections(replacements);
- };
-});
diff --git a/js/codemirror-5.23.0/addon/lint/javascript-lint.js b/js/codemirror-5.23.0/addon/lint/javascript-lint.js
deleted file mode 100644
index d4f2ae9..0000000
--- a/js/codemirror-5.23.0/addon/lint/javascript-lint.js
+++ /dev/null
@@ -1,136 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(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";
- // declare global: JSHINT
-
- var bogus = [ "Dangerous comment" ];
-
- var warnings = [ [ "Expected '{'",
- "Statement body should be inside '{ }' braces." ] ];
-
- var errors = [ "Missing semicolon", "Extra comma", "Missing property name",
- "Unmatched ", " and instead saw", " is not defined",
- "Unclosed string", "Stopping, unable to continue" ];
-
- function validator(text, options) {
- if (!window.JSHINT) return [];
- JSHINT(text, options, options.globals);
- var errors = JSHINT.data().errors, result = [];
- if (errors) parseErrors(errors, result);
- return result;
- }
-
- CodeMirror.registerHelper("lint", "javascript", validator);
-
- function cleanup(error) {
- // All problems are warnings by default
- fixWith(error, warnings, "warning", true);
- fixWith(error, errors, "error");
-
- return isBogus(error) ? null : error;
- }
-
- function fixWith(error, fixes, severity, force) {
- var description, fix, find, replace, found;
-
- description = error.description;
-
- for ( var i = 0; i < fixes.length; i++) {
- fix = fixes[i];
- find = (typeof fix === "string" ? fix : fix[0]);
- replace = (typeof fix === "string" ? null : fix[1]);
- found = description.indexOf(find) !== -1;
-
- if (force || found) {
- error.severity = severity;
- }
- if (found && replace) {
- error.description = replace;
- }
- }
- }
-
- function isBogus(error) {
- var description = error.description;
- for ( var i = 0; i < bogus.length; i++) {
- if (description.indexOf(bogus[i]) !== -1) {
- return true;
- }
- }
- return false;
- }
-
- function parseErrors(errors, output) {
- for ( var i = 0; i < errors.length; i++) {
- var error = errors[i];
- if (error) {
- var linetabpositions, index;
-
- linetabpositions = [];
-
- // This next block is to fix a problem in jshint. Jshint
- // replaces
- // all tabs with spaces then performs some checks. The error
- // positions (character/space) are then reported incorrectly,
- // not taking the replacement step into account. Here we look
- // at the evidence line and try to adjust the character position
- // to the correct value.
- if (error.evidence) {
- // Tab positions are computed once per line and cached
- var tabpositions = linetabpositions[error.line];
- if (!tabpositions) {
- var evidence = error.evidence;
- tabpositions = [];
- // ugggh phantomjs does not like this
- // forEachChar(evidence, function(item, index) {
- Array.prototype.forEach.call(evidence, function(item,
- index) {
- if (item === '\t') {
- // First col is 1 (not 0) to match error
- // positions
- tabpositions.push(index + 1);
- }
- });
- linetabpositions[error.line] = tabpositions;
- }
- if (tabpositions.length > 0) {
- var pos = error.character;
- tabpositions.forEach(function(tabposition) {
- if (pos > tabposition) pos -= 1;
- });
- error.character = pos;
- }
- }
-
- var start = error.character - 1, end = start + 1;
- if (error.evidence) {
- index = error.evidence.substring(start).search(/.\b/);
- if (index > -1) {
- end += index;
- }
- }
-
- // Convert to format expected by validation service
- error.description = error.reason;// + "(jshint)";
- error.start = error.character;
- error.end = end;
- error = cleanup(error);
-
- if (error)
- output.push({message: error.description,
- severity: error.severity,
- from: CodeMirror.Pos(error.line - 1, start),
- to: CodeMirror.Pos(error.line - 1, end)});
- }
- }
- }
-});
diff --git a/js/codemirror-5.23.0/addon/search/searchcursor.js b/js/codemirror-5.23.0/addon/search/searchcursor.js
deleted file mode 100644
index b70242e..0000000
--- a/js/codemirror-5.23.0/addon/search/searchcursor.js
+++ /dev/null
@@ -1,189 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(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";
- var Pos = CodeMirror.Pos;
-
- function SearchCursor(doc, query, pos, caseFold) {
- this.atOccurrence = false; this.doc = doc;
- if (caseFold == null && typeof query == "string") caseFold = false;
-
- pos = pos ? doc.clipPos(pos) : Pos(0, 0);
- this.pos = {from: pos, to: pos};
-
- // The matches method is filled in based on the type of query.
- // It takes a position and a direction, and returns an object
- // describing the next occurrence of the query, or null if no
- // more matches were found.
- if (typeof query != "string") { // Regexp match
- if (!query.global) query = new RegExp(query.source, query.ignoreCase ? "ig" : "g");
- this.matches = function(reverse, pos) {
- if (reverse) {
- query.lastIndex = 0;
- var line = doc.getLine(pos.line).slice(0, pos.ch), cutOff = 0, match, start;
- for (;;) {
- query.lastIndex = cutOff;
- var newMatch = query.exec(line);
- if (!newMatch) break;
- match = newMatch;
- start = match.index;
- cutOff = match.index + (match[0].length || 1);
- if (cutOff == line.length) break;
- }
- var matchLen = (match && match[0].length) || 0;
- if (!matchLen) {
- if (start == 0 && line.length == 0) {match = undefined;}
- else if (start != doc.getLine(pos.line).length) {
- matchLen++;
- }
- }
- } else {
- query.lastIndex = pos.ch;
- var line = doc.getLine(pos.line), match = query.exec(line);
- var matchLen = (match && match[0].length) || 0;
- var start = match && match.index;
- if (start + matchLen != line.length && !matchLen) matchLen = 1;
- }
- if (match && matchLen)
- return {from: Pos(pos.line, start),
- to: Pos(pos.line, start + matchLen),
- match: match};
- };
- } else { // String query
- var origQuery = query;
- if (caseFold) query = query.toLowerCase();
- var fold = caseFold ? function(str){return str.toLowerCase();} : function(str){return str;};
- var target = query.split("\n");
- // Different methods for single-line and multi-line queries
- if (target.length == 1) {
- if (!query.length) {
- // Empty string would match anything and never progress, so
- // we define it to match nothing instead.
- this.matches = function() {};
- } else {
- this.matches = function(reverse, pos) {
- if (reverse) {
- var orig = doc.getLine(pos.line).slice(0, pos.ch), line = fold(orig);
- var match = line.lastIndexOf(query);
- if (match > -1) {
- match = adjustPos(orig, line, match);
- return {from: Pos(pos.line, match), to: Pos(pos.line, match + origQuery.length)};
- }
- } else {
- var orig = doc.getLine(pos.line).slice(pos.ch), line = fold(orig);
- var match = line.indexOf(query);
- if (match > -1) {
- match = adjustPos(orig, line, match) + pos.ch;
- return {from: Pos(pos.line, match), to: Pos(pos.line, match + origQuery.length)};
- }
- }
- };
- }
- } else {
- var origTarget = origQuery.split("\n");
- this.matches = function(reverse, pos) {
- var last = target.length - 1;
- if (reverse) {
- if (pos.line - (target.length - 1) < doc.firstLine()) return;
- if (fold(doc.getLine(pos.line).slice(0, origTarget[last].length)) != target[target.length - 1]) return;
- var to = Pos(pos.line, origTarget[last].length);
- for (var ln = pos.line - 1, i = last - 1; i >= 1; --i, --ln)
- if (target[i] != fold(doc.getLine(ln))) return;
- var line = doc.getLine(ln), cut = line.length - origTarget[0].length;
- if (fold(line.slice(cut)) != target[0]) return;
- return {from: Pos(ln, cut), to: to};
- } else {
- if (pos.line + (target.length - 1) > doc.lastLine()) return;
- var line = doc.getLine(pos.line), cut = line.length - origTarget[0].length;
- if (fold(line.slice(cut)) != target[0]) return;
- var from = Pos(pos.line, cut);
- for (var ln = pos.line + 1, i = 1; i < last; ++i, ++ln)
- if (target[i] != fold(doc.getLine(ln))) return;
- if (fold(doc.getLine(ln).slice(0, origTarget[last].length)) != target[last]) return;
- return {from: from, to: Pos(ln, origTarget[last].length)};
- }
- };
- }
- }
- }
-
- SearchCursor.prototype = {
- findNext: function() {return this.find(false);},
- findPrevious: function() {return this.find(true);},
-
- find: function(reverse) {
- var self = this, pos = this.doc.clipPos(reverse ? this.pos.from : this.pos.to);
- function savePosAndFail(line) {
- var pos = Pos(line, 0);
- self.pos = {from: pos, to: pos};
- self.atOccurrence = false;
- return false;
- }
-
- for (;;) {
- if (this.pos = this.matches(reverse, pos)) {
- this.atOccurrence = true;
- return this.pos.match || true;
- }
- if (reverse) {
- if (!pos.line) return savePosAndFail(0);
- pos = Pos(pos.line-1, this.doc.getLine(pos.line-1).length);
- }
- else {
- var maxLine = this.doc.lineCount();
- if (pos.line == maxLine - 1) return savePosAndFail(maxLine);
- pos = Pos(pos.line + 1, 0);
- }
- }
- },
-
- from: function() {if (this.atOccurrence) return this.pos.from;},
- to: function() {if (this.atOccurrence) return this.pos.to;},
-
- replace: function(newText, origin) {
- if (!this.atOccurrence) return;
- var lines = CodeMirror.splitLines(newText);
- this.doc.replaceRange(lines, this.pos.from, this.pos.to, origin);
- this.pos.to = Pos(this.pos.from.line + lines.length - 1,
- lines[lines.length - 1].length + (lines.length == 1 ? this.pos.from.ch : 0));
- }
- };
-
- // Maps a position in a case-folded line back to a position in the original line
- // (compensating for codepoints increasing in number during folding)
- function adjustPos(orig, folded, pos) {
- if (orig.length == folded.length) return pos;
- for (var pos1 = Math.min(pos, orig.length);;) {
- var len1 = orig.slice(0, pos1).toLowerCase().length;
- if (len1 < pos) ++pos1;
- else if (len1 > pos) --pos1;
- else return pos1;
- }
- }
-
- CodeMirror.defineExtension("getSearchCursor", function(query, pos, caseFold) {
- return new SearchCursor(this.doc, query, pos, caseFold);
- });
- CodeMirror.defineDocExtension("getSearchCursor", function(query, pos, caseFold) {
- return new SearchCursor(this, query, pos, caseFold);
- });
-
- CodeMirror.defineExtension("selectMatches", function(query, caseFold) {
- var ranges = [];
- var cur = this.getSearchCursor(query, this.getCursor("from"), caseFold);
- while (cur.findNext()) {
- if (CodeMirror.cmpPos(cur.to(), this.getCursor("to")) > 0) break;
- ranges.push({anchor: cur.from(), head: cur.to()});
- }
- if (ranges.length)
- this.setSelections(ranges, 0);
- });
-});
diff --git a/js/codemirror-5.23.0/bin/compress b/js/codemirror-5.23.0/bin/compress
deleted file mode 100755
index d358f9c..0000000
--- a/js/codemirror-5.23.0/bin/compress
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/usr/bin/env node
-
-// Compression helper for CodeMirror
-//
-// Example:
-//
-// bin/compress codemirror runmode javascript xml
-//
-// Will take lib/codemirror.js, addon/runmode/runmode.js,
-// mode/javascript/javascript.js, and mode/xml/xml.js, run them though
-// the online minifier at http://marijnhaverbeke.nl/uglifyjs, and spit
-// out the result.
-//
-// bin/compress codemirror --local /path/to/bin/UglifyJS
-//
-// Will use a local minifier instead of the online default one.
-//
-// Script files are specified without .js ending. Prefixing them with
-// their full (local) path is optional. So you may say lib/codemirror
-// or mode/xml/xml to be more precise. In fact, even the .js suffix
-// may be specified, if wanted.
-
-"use strict";
-
-var fs = require("fs");
-
-function help(ok) {
- console.log("usage: " + process.argv[1] + " [--local /path/to/uglifyjs] files...");
- process.exit(ok ? 0 : 1);
-}
-
-var local = null, args = [], extraArgs = null, files = [], blob = "";
-
-for (var i = 2; i < process.argv.length; ++i) {
- var arg = process.argv[i];
- if (arg == "--local" && i + 1 < process.argv.length) {
- var parts = process.argv[++i].split(/\s+/);
- local = parts[0];
- extraArgs = parts.slice(1);
- if (!extraArgs.length) extraArgs = ["-c", "-m"];
- } else if (arg == "--help") {
- help(true);
- } else if (arg[0] != "-") {
- files.push({name: arg, re: new RegExp("(?:\\/|^)" + arg + (/\.js$/.test(arg) ? "$" : "\\.js$"))});
- } else help(false);
-}
-
-function walk(dir) {
- fs.readdirSync(dir).forEach(function(fname) {
- if (/^[_\.]/.test(fname)) return;
- var file = dir + fname;
- if (fs.statSync(file).isDirectory()) return walk(file + "/");
- if (files.some(function(spec, i) {
- var match = spec.re.test(file);
- if (match) files.splice(i, 1);
- return match;
- })) {
- if (local) args.push(file);
- else blob += fs.readFileSync(file, "utf8");
- }
- });
-}
-
-walk("lib/");
-walk("addon/");
-walk("mode/");
-
-if (!local && !blob) help(false);
-
-if (files.length) {
- console.log("Some specified files were not found: " +
- files.map(function(a){return a.name;}).join(", "));
- process.exit(1);
-}
-
-if (local) {
- require("child_process").spawn(local, args.concat(extraArgs), {stdio: ["ignore", process.stdout, process.stderr]});
-} else {
- var data = new Buffer("js_code=" + require("querystring").escape(blob), "utf8");
- var req = require("http").request({
- host: "marijnhaverbeke.nl",
- port: 80,
- method: "POST",
- path: "/uglifyjs",
- headers: {"content-type": "application/x-www-form-urlencoded",
- "content-length": data.length}
- });
- req.on("response", function(resp) {
- resp.on("data", function (chunk) { process.stdout.write(chunk); });
- });
- req.end(data);
-}
diff --git a/js/codemirror-5.23.0/doc/logo.svg b/js/codemirror-5.23.0/doc/logo.svg
deleted file mode 100644
index 0aa6323..0000000
--- a/js/codemirror-5.23.0/doc/logo.svg
+++ /dev/null
@@ -1,181 +0,0 @@
-
-
-
-image/svg+xml
\ No newline at end of file
diff --git a/js/codemirror-5.23.0/lib/codemirror.js b/js/codemirror-5.23.0/lib/codemirror.js
deleted file mode 100644
index 3e0cc2b..0000000
--- a/js/codemirror-5.23.0/lib/codemirror.js
+++ /dev/null
@@ -1,9113 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// This is CodeMirror (http://codemirror.net), a code editor
-// implemented in JavaScript on top of the browser's DOM.
-//
-// You can find some technical background for some of the code below
-// at http://marijnhaverbeke.nl/blog/#cm-internals .
-
-(function (global, factory) {
- typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
- typeof define === 'function' && define.amd ? define(factory) :
- (global.CodeMirror = factory());
-}(this, (function () { 'use strict';
-
-// Kludges for bugs and behavior differences that can't be feature
-// detected are enabled based on userAgent etc sniffing.
-var userAgent = navigator.userAgent
-var platform = navigator.platform
-
-var gecko = /gecko\/\d/i.test(userAgent)
-var ie_upto10 = /MSIE \d/.test(userAgent)
-var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(userAgent)
-var ie = ie_upto10 || ie_11up
-var ie_version = ie && (ie_upto10 ? document.documentMode || 6 : ie_11up[1])
-var webkit = /WebKit\//.test(userAgent)
-var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(userAgent)
-var chrome = /Chrome\//.test(userAgent)
-var presto = /Opera\//.test(userAgent)
-var safari = /Apple Computer/.test(navigator.vendor)
-var mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(userAgent)
-var phantom = /PhantomJS/.test(userAgent)
-
-var ios = /AppleWebKit/.test(userAgent) && /Mobile\/\w+/.test(userAgent)
-// This is woefully incomplete. Suggestions for alternative methods welcome.
-var mobile = ios || /Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(userAgent)
-var mac = ios || /Mac/.test(platform)
-var chromeOS = /\bCrOS\b/.test(userAgent)
-var windows = /win/i.test(platform)
-
-var presto_version = presto && userAgent.match(/Version\/(\d*\.\d*)/)
-if (presto_version) { presto_version = Number(presto_version[1]) }
-if (presto_version && presto_version >= 15) { presto = false; webkit = true }
-// Some browsers use the wrong event properties to signal cmd/ctrl on OS X
-var flipCtrlCmd = mac && (qtwebkit || presto && (presto_version == null || presto_version < 12.11))
-var captureRightClick = gecko || (ie && ie_version >= 9)
-
-function classTest(cls) { return new RegExp("(^|\\s)" + cls + "(?:$|\\s)\\s*") }
-
-var rmClass = function(node, cls) {
- var current = node.className
- var match = classTest(cls).exec(current)
- if (match) {
- var after = current.slice(match.index + match[0].length)
- node.className = current.slice(0, match.index) + (after ? match[1] + after : "")
- }
-}
-
-function removeChildren(e) {
- for (var count = e.childNodes.length; count > 0; --count)
- { e.removeChild(e.firstChild) }
- return e
-}
-
-function removeChildrenAndAdd(parent, e) {
- return removeChildren(parent).appendChild(e)
-}
-
-function elt(tag, content, className, style) {
- var e = document.createElement(tag)
- if (className) { e.className = className }
- if (style) { e.style.cssText = style }
- if (typeof content == "string") { e.appendChild(document.createTextNode(content)) }
- else if (content) { for (var i = 0; i < content.length; ++i) { e.appendChild(content[i]) } }
- return e
-}
-
-var range
-if (document.createRange) { range = function(node, start, end, endNode) {
- var r = document.createRange()
- r.setEnd(endNode || node, end)
- r.setStart(node, start)
- return r
-} }
-else { range = function(node, start, end) {
- var r = document.body.createTextRange()
- try { r.moveToElementText(node.parentNode) }
- catch(e) { return r }
- r.collapse(true)
- r.moveEnd("character", end)
- r.moveStart("character", start)
- return r
-} }
-
-function contains(parent, child) {
- if (child.nodeType == 3) // Android browser always returns false when child is a textnode
- { child = child.parentNode }
- if (parent.contains)
- { return parent.contains(child) }
- do {
- if (child.nodeType == 11) { child = child.host }
- if (child == parent) { return true }
- } while (child = child.parentNode)
-}
-
-function activeElt() {
- // IE and Edge may throw an "Unspecified Error" when accessing document.activeElement.
- // IE < 10 will throw when accessed while the page is loading or in an iframe.
- // IE > 9 and Edge will throw when accessed in an iframe if document.body is unavailable.
- var activeElement
- try {
- activeElement = document.activeElement
- } catch(e) {
- activeElement = document.body || null
- }
- while (activeElement && activeElement.root && activeElement.root.activeElement)
- { activeElement = activeElement.root.activeElement }
- return activeElement
-}
-
-function addClass(node, cls) {
- var current = node.className
- if (!classTest(cls).test(current)) { node.className += (current ? " " : "") + cls }
-}
-function joinClasses(a, b) {
- var as = a.split(" ")
- for (var i = 0; i < as.length; i++)
- { if (as[i] && !classTest(as[i]).test(b)) { b += " " + as[i] } }
- return b
-}
-
-var selectInput = function(node) { node.select() }
-if (ios) // Mobile Safari apparently has a bug where select() is broken.
- { selectInput = function(node) { node.selectionStart = 0; node.selectionEnd = node.value.length } }
-else if (ie) // Suppress mysterious IE10 errors
- { selectInput = function(node) { try { node.select() } catch(_e) {} } }
-
-function bind(f) {
- var args = Array.prototype.slice.call(arguments, 1)
- return function(){return f.apply(null, args)}
-}
-
-function copyObj(obj, target, overwrite) {
- if (!target) { target = {} }
- for (var prop in obj)
- { if (obj.hasOwnProperty(prop) && (overwrite !== false || !target.hasOwnProperty(prop)))
- { target[prop] = obj[prop] } }
- return target
-}
-
-// Counts the column offset in a string, taking tabs into account.
-// Used mostly to find indentation.
-function countColumn(string, end, tabSize, startIndex, startValue) {
- if (end == null) {
- end = string.search(/[^\s\u00a0]/)
- if (end == -1) { end = string.length }
- }
- for (var i = startIndex || 0, n = startValue || 0;;) {
- var nextTab = string.indexOf("\t", i)
- if (nextTab < 0 || nextTab >= end)
- { return n + (end - i) }
- n += nextTab - i
- n += tabSize - (n % tabSize)
- i = nextTab + 1
- }
-}
-
-function Delayed() {this.id = null}
-Delayed.prototype.set = function(ms, f) {
- clearTimeout(this.id)
- this.id = setTimeout(f, ms)
-}
-
-function indexOf(array, elt) {
- for (var i = 0; i < array.length; ++i)
- { if (array[i] == elt) { return i } }
- return -1
-}
-
-// Number of pixels added to scroller and sizer to hide scrollbar
-var scrollerGap = 30
-
-// Returned or thrown by various protocols to signal 'I'm not
-// handling this'.
-var Pass = {toString: function(){return "CodeMirror.Pass"}}
-
-// Reused option objects for setSelection & friends
-var sel_dontScroll = {scroll: false};
-var sel_mouse = {origin: "*mouse"};
-var sel_move = {origin: "+move"};
-// The inverse of countColumn -- find the offset that corresponds to
-// a particular column.
-function findColumn(string, goal, tabSize) {
- for (var pos = 0, col = 0;;) {
- var nextTab = string.indexOf("\t", pos)
- if (nextTab == -1) { nextTab = string.length }
- var skipped = nextTab - pos
- if (nextTab == string.length || col + skipped >= goal)
- { return pos + Math.min(skipped, goal - col) }
- col += nextTab - pos
- col += tabSize - (col % tabSize)
- pos = nextTab + 1
- if (col >= goal) { return pos }
- }
-}
-
-var spaceStrs = [""]
-function spaceStr(n) {
- while (spaceStrs.length <= n)
- { spaceStrs.push(lst(spaceStrs) + " ") }
- return spaceStrs[n]
-}
-
-function lst(arr) { return arr[arr.length-1] }
-
-function map(array, f) {
- var out = []
- for (var i = 0; i < array.length; i++) { out[i] = f(array[i], i) }
- return out
-}
-
-function insertSorted(array, value, score) {
- var pos = 0, priority = score(value)
- while (pos < array.length && score(array[pos]) <= priority) { pos++ }
- array.splice(pos, 0, value)
-}
-
-function nothing() {}
-
-function createObj(base, props) {
- var inst
- if (Object.create) {
- inst = Object.create(base)
- } else {
- nothing.prototype = base
- inst = new nothing()
- }
- if (props) { copyObj(props, inst) }
- return inst
-}
-
-var nonASCIISingleCaseWordChar = /[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/
-function isWordCharBasic(ch) {
- return /\w/.test(ch) || ch > "\x80" &&
- (ch.toUpperCase() != ch.toLowerCase() || nonASCIISingleCaseWordChar.test(ch))
-}
-function isWordChar(ch, helper) {
- if (!helper) { return isWordCharBasic(ch) }
- if (helper.source.indexOf("\\w") > -1 && isWordCharBasic(ch)) { return true }
- return helper.test(ch)
-}
-
-function isEmpty(obj) {
- for (var n in obj) { if (obj.hasOwnProperty(n) && obj[n]) { return false } }
- return true
-}
-
-// Extending unicode characters. A series of a non-extending char +
-// any number of extending chars is treated as a single unit as far
-// as editing and measuring is concerned. This is not fully correct,
-// since some scripts/fonts/browsers also treat other configurations
-// of code points as a group.
-var extendingChars = /[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/
-function isExtendingChar(ch) { return ch.charCodeAt(0) >= 768 && extendingChars.test(ch) }
-
-// The display handles the DOM integration, both for input reading
-// and content drawing. It holds references to DOM nodes and
-// display-related state.
-
-function Display(place, doc, input) {
- var d = this
- this.input = input
-
- // Covers bottom-right square when both scrollbars are present.
- d.scrollbarFiller = elt("div", null, "CodeMirror-scrollbar-filler")
- d.scrollbarFiller.setAttribute("cm-not-content", "true")
- // Covers bottom of gutter when coverGutterNextToScrollbar is on
- // and h scrollbar is present.
- d.gutterFiller = elt("div", null, "CodeMirror-gutter-filler")
- d.gutterFiller.setAttribute("cm-not-content", "true")
- // Will contain the actual code, positioned to cover the viewport.
- d.lineDiv = elt("div", null, "CodeMirror-code")
- // Elements are added to these to represent selection and cursors.
- d.selectionDiv = elt("div", null, null, "position: relative; z-index: 1")
- d.cursorDiv = elt("div", null, "CodeMirror-cursors")
- // A visibility: hidden element used to find the size of things.
- d.measure = elt("div", null, "CodeMirror-measure")
- // When lines outside of the viewport are measured, they are drawn in this.
- d.lineMeasure = elt("div", null, "CodeMirror-measure")
- // Wraps everything that needs to exist inside the vertically-padded coordinate system
- d.lineSpace = elt("div", [d.measure, d.lineMeasure, d.selectionDiv, d.cursorDiv, d.lineDiv],
- null, "position: relative; outline: none")
- // Moved around its parent to cover visible view.
- d.mover = elt("div", [elt("div", [d.lineSpace], "CodeMirror-lines")], null, "position: relative")
- // Set to the height of the document, allowing scrolling.
- d.sizer = elt("div", [d.mover], "CodeMirror-sizer")
- d.sizerWidth = null
- // Behavior of elts with overflow: auto and padding is
- // inconsistent across browsers. This is used to ensure the
- // scrollable area is big enough.
- d.heightForcer = elt("div", null, null, "position: absolute; height: " + scrollerGap + "px; width: 1px;")
- // Will contain the gutters, if any.
- d.gutters = elt("div", null, "CodeMirror-gutters")
- d.lineGutter = null
- // Actual scrollable element.
- d.scroller = elt("div", [d.sizer, d.heightForcer, d.gutters], "CodeMirror-scroll")
- d.scroller.setAttribute("tabIndex", "-1")
- // The element in which the editor lives.
- d.wrapper = elt("div", [d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror")
-
- // Work around IE7 z-index bug (not perfect, hence IE7 not really being supported)
- if (ie && ie_version < 8) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0 }
- if (!webkit && !(gecko && mobile)) { d.scroller.draggable = true }
-
- if (place) {
- if (place.appendChild) { place.appendChild(d.wrapper) }
- else { place(d.wrapper) }
- }
-
- // Current rendered range (may be bigger than the view window).
- d.viewFrom = d.viewTo = doc.first
- d.reportedViewFrom = d.reportedViewTo = doc.first
- // Information about the rendered lines.
- d.view = []
- d.renderedView = null
- // Holds info about a single rendered line when it was rendered
- // for measurement, while not in view.
- d.externalMeasured = null
- // Empty space (in pixels) above the view
- d.viewOffset = 0
- d.lastWrapHeight = d.lastWrapWidth = 0
- d.updateLineNumbers = null
-
- d.nativeBarWidth = d.barHeight = d.barWidth = 0
- d.scrollbarsClipped = false
-
- // Used to only resize the line number gutter when necessary (when
- // the amount of lines crosses a boundary that makes its width change)
- d.lineNumWidth = d.lineNumInnerWidth = d.lineNumChars = null
- // Set to true when a non-horizontal-scrolling line widget is
- // added. As an optimization, line widget aligning is skipped when
- // this is false.
- d.alignWidgets = false
-
- d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null
-
- // Tracks the maximum line length so that the horizontal scrollbar
- // can be kept static when scrolling.
- d.maxLine = null
- d.maxLineLength = 0
- d.maxLineChanged = false
-
- // Used for measuring wheel scrolling granularity
- d.wheelDX = d.wheelDY = d.wheelStartX = d.wheelStartY = null
-
- // True when shift is held down.
- d.shift = false
-
- // Used to track whether anything happened since the context menu
- // was opened.
- d.selForContextMenu = null
-
- d.activeTouch = null
-
- input.init(d)
-}
-
-// Find the line object corresponding to the given line number.
-function getLine(doc, n) {
- n -= doc.first
- if (n < 0 || n >= doc.size) { throw new Error("There is no line " + (n + doc.first) + " in the document.") }
- var chunk = doc
- while (!chunk.lines) {
- for (var i = 0;; ++i) {
- var child = chunk.children[i], sz = child.chunkSize()
- if (n < sz) { chunk = child; break }
- n -= sz
- }
- }
- return chunk.lines[n]
-}
-
-// Get the part of a document between two positions, as an array of
-// strings.
-function getBetween(doc, start, end) {
- var out = [], n = start.line
- doc.iter(start.line, end.line + 1, function (line) {
- var text = line.text
- if (n == end.line) { text = text.slice(0, end.ch) }
- if (n == start.line) { text = text.slice(start.ch) }
- out.push(text)
- ++n
- })
- return out
-}
-// Get the lines between from and to, as array of strings.
-function getLines(doc, from, to) {
- var out = []
- doc.iter(from, to, function (line) { out.push(line.text) }) // iter aborts when callback returns truthy value
- return out
-}
-
-// Update the height of a line, propagating the height change
-// upwards to parent nodes.
-function updateLineHeight(line, height) {
- var diff = height - line.height
- if (diff) { for (var n = line; n; n = n.parent) { n.height += diff } }
-}
-
-// Given a line object, find its line number by walking up through
-// its parent links.
-function lineNo(line) {
- if (line.parent == null) { return null }
- var cur = line.parent, no = indexOf(cur.lines, line)
- for (var chunk = cur.parent; chunk; cur = chunk, chunk = chunk.parent) {
- for (var i = 0;; ++i) {
- if (chunk.children[i] == cur) { break }
- no += chunk.children[i].chunkSize()
- }
- }
- return no + cur.first
-}
-
-// Find the line at the given vertical position, using the height
-// information in the document tree.
-function lineAtHeight(chunk, h) {
- var n = chunk.first
- outer: do {
- for (var i$1 = 0; i$1 < chunk.children.length; ++i$1) {
- var child = chunk.children[i$1], ch = child.height
- if (h < ch) { chunk = child; continue outer }
- h -= ch
- n += child.chunkSize()
- }
- return n
- } while (!chunk.lines)
- var i = 0
- for (; i < chunk.lines.length; ++i) {
- var line = chunk.lines[i], lh = line.height
- if (h < lh) { break }
- h -= lh
- }
- return n + i
-}
-
-function isLine(doc, l) {return l >= doc.first && l < doc.first + doc.size}
-
-function lineNumberFor(options, i) {
- return String(options.lineNumberFormatter(i + options.firstLineNumber))
-}
-
-// A Pos instance represents a position within the text.
-function Pos (line, ch) {
- if (!(this instanceof Pos)) { return new Pos(line, ch) }
- this.line = line; this.ch = ch
-}
-
-// Compare two positions, return 0 if they are the same, a negative
-// number when a is less, and a positive number otherwise.
-function cmp(a, b) { return a.line - b.line || a.ch - b.ch }
-
-function copyPos(x) {return Pos(x.line, x.ch)}
-function maxPos(a, b) { return cmp(a, b) < 0 ? b : a }
-function minPos(a, b) { return cmp(a, b) < 0 ? a : b }
-
-// Most of the external API clips given positions to make sure they
-// actually exist within the document.
-function clipLine(doc, n) {return Math.max(doc.first, Math.min(n, doc.first + doc.size - 1))}
-function clipPos(doc, pos) {
- if (pos.line < doc.first) { return Pos(doc.first, 0) }
- var last = doc.first + doc.size - 1
- if (pos.line > last) { return Pos(last, getLine(doc, last).text.length) }
- return clipToLen(pos, getLine(doc, pos.line).text.length)
-}
-function clipToLen(pos, linelen) {
- var ch = pos.ch
- if (ch == null || ch > linelen) { return Pos(pos.line, linelen) }
- else if (ch < 0) { return Pos(pos.line, 0) }
- else { return pos }
-}
-function clipPosArray(doc, array) {
- var out = []
- for (var i = 0; i < array.length; i++) { out[i] = clipPos(doc, array[i]) }
- return out
-}
-
-// Optimize some code when these features are not used.
-var sawReadOnlySpans = false;
-var sawCollapsedSpans = false;
-function seeReadOnlySpans() {
- sawReadOnlySpans = true
-}
-
-function seeCollapsedSpans() {
- sawCollapsedSpans = true
-}
-
-// TEXTMARKER SPANS
-
-function MarkedSpan(marker, from, to) {
- this.marker = marker
- this.from = from; this.to = to
-}
-
-// Search an array of spans for a span matching the given marker.
-function getMarkedSpanFor(spans, marker) {
- if (spans) { for (var i = 0; i < spans.length; ++i) {
- var span = spans[i]
- if (span.marker == marker) { return span }
- } }
-}
-// Remove a span from an array, returning undefined if no spans are
-// left (we don't store arrays for lines without spans).
-function removeMarkedSpan(spans, span) {
- var r
- for (var i = 0; i < spans.length; ++i)
- { if (spans[i] != span) { (r || (r = [])).push(spans[i]) } }
- return r
-}
-// Add a span to a line.
-function addMarkedSpan(line, span) {
- line.markedSpans = line.markedSpans ? line.markedSpans.concat([span]) : [span]
- span.marker.attachLine(line)
-}
-
-// Used for the algorithm that adjusts markers for a change in the
-// document. These functions cut an array of spans at a given
-// character position, returning an array of remaining chunks (or
-// undefined if nothing remains).
-function markedSpansBefore(old, startCh, isInsert) {
- var nw
- if (old) { for (var i = 0; i < old.length; ++i) {
- var span = old[i], marker = span.marker
- var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= startCh : span.from < startCh)
- if (startsBefore || span.from == startCh && marker.type == "bookmark" && (!isInsert || !span.marker.insertLeft)) {
- var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= startCh : span.to > startCh)
- ;(nw || (nw = [])).push(new MarkedSpan(marker, span.from, endsAfter ? null : span.to))
- }
- } }
- return nw
-}
-function markedSpansAfter(old, endCh, isInsert) {
- var nw
- if (old) { for (var i = 0; i < old.length; ++i) {
- var span = old[i], marker = span.marker
- var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= endCh : span.to > endCh)
- if (endsAfter || span.from == endCh && marker.type == "bookmark" && (!isInsert || span.marker.insertLeft)) {
- var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= endCh : span.from < endCh)
- ;(nw || (nw = [])).push(new MarkedSpan(marker, startsBefore ? null : span.from - endCh,
- span.to == null ? null : span.to - endCh))
- }
- } }
- return nw
-}
-
-// Given a change object, compute the new set of marker spans that
-// cover the line in which the change took place. Removes spans
-// entirely within the change, reconnects spans belonging to the
-// same marker that appear on both sides of the change, and cuts off
-// spans partially within the change. Returns an array of span
-// arrays with one element for each line in (after) the change.
-function stretchSpansOverChange(doc, change) {
- if (change.full) { return null }
- var oldFirst = isLine(doc, change.from.line) && getLine(doc, change.from.line).markedSpans
- var oldLast = isLine(doc, change.to.line) && getLine(doc, change.to.line).markedSpans
- if (!oldFirst && !oldLast) { return null }
-
- var startCh = change.from.ch, endCh = change.to.ch, isInsert = cmp(change.from, change.to) == 0
- // Get the spans that 'stick out' on both sides
- var first = markedSpansBefore(oldFirst, startCh, isInsert)
- var last = markedSpansAfter(oldLast, endCh, isInsert)
-
- // Next, merge those two ends
- var sameLine = change.text.length == 1, offset = lst(change.text).length + (sameLine ? startCh : 0)
- if (first) {
- // Fix up .to properties of first
- for (var i = 0; i < first.length; ++i) {
- var span = first[i]
- if (span.to == null) {
- var found = getMarkedSpanFor(last, span.marker)
- if (!found) { span.to = startCh }
- else if (sameLine) { span.to = found.to == null ? null : found.to + offset }
- }
- }
- }
- if (last) {
- // Fix up .from in last (or move them into first in case of sameLine)
- for (var i$1 = 0; i$1 < last.length; ++i$1) {
- var span$1 = last[i$1]
- if (span$1.to != null) { span$1.to += offset }
- if (span$1.from == null) {
- var found$1 = getMarkedSpanFor(first, span$1.marker)
- if (!found$1) {
- span$1.from = offset
- if (sameLine) { (first || (first = [])).push(span$1) }
- }
- } else {
- span$1.from += offset
- if (sameLine) { (first || (first = [])).push(span$1) }
- }
- }
- }
- // Make sure we didn't create any zero-length spans
- if (first) { first = clearEmptySpans(first) }
- if (last && last != first) { last = clearEmptySpans(last) }
-
- var newMarkers = [first]
- if (!sameLine) {
- // Fill gap with whole-line-spans
- var gap = change.text.length - 2, gapMarkers
- if (gap > 0 && first)
- { for (var i$2 = 0; i$2 < first.length; ++i$2)
- { if (first[i$2].to == null)
- { (gapMarkers || (gapMarkers = [])).push(new MarkedSpan(first[i$2].marker, null, null)) } } }
- for (var i$3 = 0; i$3 < gap; ++i$3)
- { newMarkers.push(gapMarkers) }
- newMarkers.push(last)
- }
- return newMarkers
-}
-
-// Remove spans that are empty and don't have a clearWhenEmpty
-// option of false.
-function clearEmptySpans(spans) {
- for (var i = 0; i < spans.length; ++i) {
- var span = spans[i]
- if (span.from != null && span.from == span.to && span.marker.clearWhenEmpty !== false)
- { spans.splice(i--, 1) }
- }
- if (!spans.length) { return null }
- return spans
-}
-
-// Used to 'clip' out readOnly ranges when making a change.
-function removeReadOnlyRanges(doc, from, to) {
- var markers = null
- doc.iter(from.line, to.line + 1, function (line) {
- if (line.markedSpans) { for (var i = 0; i < line.markedSpans.length; ++i) {
- var mark = line.markedSpans[i].marker
- if (mark.readOnly && (!markers || indexOf(markers, mark) == -1))
- { (markers || (markers = [])).push(mark) }
- } }
- })
- if (!markers) { return null }
- var parts = [{from: from, to: to}]
- for (var i = 0; i < markers.length; ++i) {
- var mk = markers[i], m = mk.find(0)
- for (var j = 0; j < parts.length; ++j) {
- var p = parts[j]
- if (cmp(p.to, m.from) < 0 || cmp(p.from, m.to) > 0) { continue }
- var newParts = [j, 1], dfrom = cmp(p.from, m.from), dto = cmp(p.to, m.to)
- if (dfrom < 0 || !mk.inclusiveLeft && !dfrom)
- { newParts.push({from: p.from, to: m.from}) }
- if (dto > 0 || !mk.inclusiveRight && !dto)
- { newParts.push({from: m.to, to: p.to}) }
- parts.splice.apply(parts, newParts)
- j += newParts.length - 1
- }
- }
- return parts
-}
-
-// Connect or disconnect spans from a line.
-function detachMarkedSpans(line) {
- var spans = line.markedSpans
- if (!spans) { return }
- for (var i = 0; i < spans.length; ++i)
- { spans[i].marker.detachLine(line) }
- line.markedSpans = null
-}
-function attachMarkedSpans(line, spans) {
- if (!spans) { return }
- for (var i = 0; i < spans.length; ++i)
- { spans[i].marker.attachLine(line) }
- line.markedSpans = spans
-}
-
-// Helpers used when computing which overlapping collapsed span
-// counts as the larger one.
-function extraLeft(marker) { return marker.inclusiveLeft ? -1 : 0 }
-function extraRight(marker) { return marker.inclusiveRight ? 1 : 0 }
-
-// Returns a number indicating which of two overlapping collapsed
-// spans is larger (and thus includes the other). Falls back to
-// comparing ids when the spans cover exactly the same range.
-function compareCollapsedMarkers(a, b) {
- var lenDiff = a.lines.length - b.lines.length
- if (lenDiff != 0) { return lenDiff }
- var aPos = a.find(), bPos = b.find()
- var fromCmp = cmp(aPos.from, bPos.from) || extraLeft(a) - extraLeft(b)
- if (fromCmp) { return -fromCmp }
- var toCmp = cmp(aPos.to, bPos.to) || extraRight(a) - extraRight(b)
- if (toCmp) { return toCmp }
- return b.id - a.id
-}
-
-// Find out whether a line ends or starts in a collapsed span. If
-// so, return the marker for that span.
-function collapsedSpanAtSide(line, start) {
- var sps = sawCollapsedSpans && line.markedSpans, found
- if (sps) { for (var sp = (void 0), i = 0; i < sps.length; ++i) {
- sp = sps[i]
- if (sp.marker.collapsed && (start ? sp.from : sp.to) == null &&
- (!found || compareCollapsedMarkers(found, sp.marker) < 0))
- { found = sp.marker }
- } }
- return found
-}
-function collapsedSpanAtStart(line) { return collapsedSpanAtSide(line, true) }
-function collapsedSpanAtEnd(line) { return collapsedSpanAtSide(line, false) }
-
-// Test whether there exists a collapsed span that partially
-// overlaps (covers the start or end, but not both) of a new span.
-// Such overlap is not allowed.
-function conflictingCollapsedRange(doc, lineNo, from, to, marker) {
- var line = getLine(doc, lineNo)
- var sps = sawCollapsedSpans && line.markedSpans
- if (sps) { for (var i = 0; i < sps.length; ++i) {
- var sp = sps[i]
- if (!sp.marker.collapsed) { continue }
- var found = sp.marker.find(0)
- var fromCmp = cmp(found.from, from) || extraLeft(sp.marker) - extraLeft(marker)
- var toCmp = cmp(found.to, to) || extraRight(sp.marker) - extraRight(marker)
- if (fromCmp >= 0 && toCmp <= 0 || fromCmp <= 0 && toCmp >= 0) { continue }
- if (fromCmp <= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.to, from) >= 0 : cmp(found.to, from) > 0) ||
- fromCmp >= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.from, to) <= 0 : cmp(found.from, to) < 0))
- { return true }
- } }
-}
-
-// A visual line is a line as drawn on the screen. Folding, for
-// example, can cause multiple logical lines to appear on the same
-// visual line. This finds the start of the visual line that the
-// given line is part of (usually that is the line itself).
-function visualLine(line) {
- var merged
- while (merged = collapsedSpanAtStart(line))
- { line = merged.find(-1, true).line }
- return line
-}
-
-// Returns an array of logical lines that continue the visual line
-// started by the argument, or undefined if there are no such lines.
-function visualLineContinued(line) {
- var merged, lines
- while (merged = collapsedSpanAtEnd(line)) {
- line = merged.find(1, true).line
- ;(lines || (lines = [])).push(line)
- }
- return lines
-}
-
-// Get the line number of the start of the visual line that the
-// given line number is part of.
-function visualLineNo(doc, lineN) {
- var line = getLine(doc, lineN), vis = visualLine(line)
- if (line == vis) { return lineN }
- return lineNo(vis)
-}
-
-// Get the line number of the start of the next visual line after
-// the given line.
-function visualLineEndNo(doc, lineN) {
- if (lineN > doc.lastLine()) { return lineN }
- var line = getLine(doc, lineN), merged
- if (!lineIsHidden(doc, line)) { return lineN }
- while (merged = collapsedSpanAtEnd(line))
- { line = merged.find(1, true).line }
- return lineNo(line) + 1
-}
-
-// Compute whether a line is hidden. Lines count as hidden when they
-// are part of a visual line that starts with another line, or when
-// they are entirely covered by collapsed, non-widget span.
-function lineIsHidden(doc, line) {
- var sps = sawCollapsedSpans && line.markedSpans
- if (sps) { for (var sp = (void 0), i = 0; i < sps.length; ++i) {
- sp = sps[i]
- if (!sp.marker.collapsed) { continue }
- if (sp.from == null) { return true }
- if (sp.marker.widgetNode) { continue }
- if (sp.from == 0 && sp.marker.inclusiveLeft && lineIsHiddenInner(doc, line, sp))
- { return true }
- } }
-}
-function lineIsHiddenInner(doc, line, span) {
- if (span.to == null) {
- var end = span.marker.find(1, true)
- return lineIsHiddenInner(doc, end.line, getMarkedSpanFor(end.line.markedSpans, span.marker))
- }
- if (span.marker.inclusiveRight && span.to == line.text.length)
- { return true }
- for (var sp = (void 0), i = 0; i < line.markedSpans.length; ++i) {
- sp = line.markedSpans[i]
- if (sp.marker.collapsed && !sp.marker.widgetNode && sp.from == span.to &&
- (sp.to == null || sp.to != span.from) &&
- (sp.marker.inclusiveLeft || span.marker.inclusiveRight) &&
- lineIsHiddenInner(doc, line, sp)) { return true }
- }
-}
-
-// Find the height above the given line.
-function heightAtLine(lineObj) {
- lineObj = visualLine(lineObj)
-
- var h = 0, chunk = lineObj.parent
- for (var i = 0; i < chunk.lines.length; ++i) {
- var line = chunk.lines[i]
- if (line == lineObj) { break }
- else { h += line.height }
- }
- for (var p = chunk.parent; p; chunk = p, p = chunk.parent) {
- for (var i$1 = 0; i$1 < p.children.length; ++i$1) {
- var cur = p.children[i$1]
- if (cur == chunk) { break }
- else { h += cur.height }
- }
- }
- return h
-}
-
-// Compute the character length of a line, taking into account
-// collapsed ranges (see markText) that might hide parts, and join
-// other lines onto it.
-function lineLength(line) {
- if (line.height == 0) { return 0 }
- var len = line.text.length, merged, cur = line
- while (merged = collapsedSpanAtStart(cur)) {
- var found = merged.find(0, true)
- cur = found.from.line
- len += found.from.ch - found.to.ch
- }
- cur = line
- while (merged = collapsedSpanAtEnd(cur)) {
- var found$1 = merged.find(0, true)
- len -= cur.text.length - found$1.from.ch
- cur = found$1.to.line
- len += cur.text.length - found$1.to.ch
- }
- return len
-}
-
-// Find the longest line in the document.
-function findMaxLine(cm) {
- var d = cm.display, doc = cm.doc
- d.maxLine = getLine(doc, doc.first)
- d.maxLineLength = lineLength(d.maxLine)
- d.maxLineChanged = true
- doc.iter(function (line) {
- var len = lineLength(line)
- if (len > d.maxLineLength) {
- d.maxLineLength = len
- d.maxLine = line
- }
- })
-}
-
-// BIDI HELPERS
-
-function iterateBidiSections(order, from, to, f) {
- if (!order) { return f(from, to, "ltr") }
- var found = false
- for (var i = 0; i < order.length; ++i) {
- var part = order[i]
- if (part.from < to && part.to > from || from == to && part.to == from) {
- f(Math.max(part.from, from), Math.min(part.to, to), part.level == 1 ? "rtl" : "ltr")
- found = true
- }
- }
- if (!found) { f(from, to, "ltr") }
-}
-
-function bidiLeft(part) { return part.level % 2 ? part.to : part.from }
-function bidiRight(part) { return part.level % 2 ? part.from : part.to }
-
-function lineLeft(line) { var order = getOrder(line); return order ? bidiLeft(order[0]) : 0 }
-function lineRight(line) {
- var order = getOrder(line)
- if (!order) { return line.text.length }
- return bidiRight(lst(order))
-}
-
-function compareBidiLevel(order, a, b) {
- var linedir = order[0].level
- if (a == linedir) { return true }
- if (b == linedir) { return false }
- return a < b
-}
-
-var bidiOther = null
-function getBidiPartAt(order, pos) {
- var found
- bidiOther = null
- for (var i = 0; i < order.length; ++i) {
- var cur = order[i]
- if (cur.from < pos && cur.to > pos) { return i }
- if ((cur.from == pos || cur.to == pos)) {
- if (found == null) {
- found = i
- } else if (compareBidiLevel(order, cur.level, order[found].level)) {
- if (cur.from != cur.to) { bidiOther = found }
- return i
- } else {
- if (cur.from != cur.to) { bidiOther = i }
- return found
- }
- }
- }
- return found
-}
-
-function moveInLine(line, pos, dir, byUnit) {
- if (!byUnit) { return pos + dir }
- do { pos += dir }
- while (pos > 0 && isExtendingChar(line.text.charAt(pos)))
- return pos
-}
-
-// This is needed in order to move 'visually' through bi-directional
-// text -- i.e., pressing left should make the cursor go left, even
-// when in RTL text. The tricky part is the 'jumps', where RTL and
-// LTR text touch each other. This often requires the cursor offset
-// to move more than one unit, in order to visually move one unit.
-function moveVisually(line, start, dir, byUnit) {
- var bidi = getOrder(line)
- if (!bidi) { return moveLogically(line, start, dir, byUnit) }
- var pos = getBidiPartAt(bidi, start), part = bidi[pos]
- var target = moveInLine(line, start, part.level % 2 ? -dir : dir, byUnit)
-
- for (;;) {
- if (target > part.from && target < part.to) { return target }
- if (target == part.from || target == part.to) {
- if (getBidiPartAt(bidi, target) == pos) { return target }
- part = bidi[pos += dir]
- return (dir > 0) == part.level % 2 ? part.to : part.from
- } else {
- part = bidi[pos += dir]
- if (!part) { return null }
- if ((dir > 0) == part.level % 2)
- { target = moveInLine(line, part.to, -1, byUnit) }
- else
- { target = moveInLine(line, part.from, 1, byUnit) }
- }
- }
-}
-
-function moveLogically(line, start, dir, byUnit) {
- var target = start + dir
- if (byUnit) { while (target > 0 && isExtendingChar(line.text.charAt(target))) { target += dir } }
- return target < 0 || target > line.text.length ? null : target
-}
-
-// Bidirectional ordering algorithm
-// See http://unicode.org/reports/tr9/tr9-13.html for the algorithm
-// that this (partially) implements.
-
-// One-char codes used for character types:
-// L (L): Left-to-Right
-// R (R): Right-to-Left
-// r (AL): Right-to-Left Arabic
-// 1 (EN): European Number
-// + (ES): European Number Separator
-// % (ET): European Number Terminator
-// n (AN): Arabic Number
-// , (CS): Common Number Separator
-// m (NSM): Non-Spacing Mark
-// b (BN): Boundary Neutral
-// s (B): Paragraph Separator
-// t (S): Segment Separator
-// w (WS): Whitespace
-// N (ON): Other Neutrals
-
-// Returns null if characters are ordered as they appear
-// (left-to-right), or an array of sections ({from, to, level}
-// objects) in the order in which they occur visually.
-var bidiOrdering = (function() {
- // Character types for codepoints 0 to 0xff
- var lowTypes = "bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN"
- // Character types for codepoints 0x600 to 0x6f9
- var arabicTypes = "nnnnnnNNr%%r,rNNmmmmmmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmmmnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmnNmmmmmmrrmmNmmmmrr1111111111"
- function charType(code) {
- if (code <= 0xf7) { return lowTypes.charAt(code) }
- else if (0x590 <= code && code <= 0x5f4) { return "R" }
- else if (0x600 <= code && code <= 0x6f9) { return arabicTypes.charAt(code - 0x600) }
- else if (0x6ee <= code && code <= 0x8ac) { return "r" }
- else if (0x2000 <= code && code <= 0x200b) { return "w" }
- else if (code == 0x200c) { return "b" }
- else { return "L" }
- }
-
- var bidiRE = /[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/
- var isNeutral = /[stwN]/, isStrong = /[LRr]/, countsAsLeft = /[Lb1n]/, countsAsNum = /[1n]/
- // Browsers seem to always treat the boundaries of block elements as being L.
- var outerType = "L"
-
- function BidiSpan(level, from, to) {
- this.level = level
- this.from = from; this.to = to
- }
-
- return function(str) {
- if (!bidiRE.test(str)) { return false }
- var len = str.length, types = []
- for (var i = 0; i < len; ++i)
- { types.push(charType(str.charCodeAt(i))) }
-
- // W1. Examine each non-spacing mark (NSM) in the level run, and
- // change the type of the NSM to the type of the previous
- // character. If the NSM is at the start of the level run, it will
- // get the type of sor.
- for (var i$1 = 0, prev = outerType; i$1 < len; ++i$1) {
- var type = types[i$1]
- if (type == "m") { types[i$1] = prev }
- else { prev = type }
- }
-
- // W2. Search backwards from each instance of a European number
- // until the first strong type (R, L, AL, or sor) is found. If an
- // AL is found, change the type of the European number to Arabic
- // number.
- // W3. Change all ALs to R.
- for (var i$2 = 0, cur = outerType; i$2 < len; ++i$2) {
- var type$1 = types[i$2]
- if (type$1 == "1" && cur == "r") { types[i$2] = "n" }
- else if (isStrong.test(type$1)) { cur = type$1; if (type$1 == "r") { types[i$2] = "R" } }
- }
-
- // W4. A single European separator between two European numbers
- // changes to a European number. A single common separator between
- // two numbers of the same type changes to that type.
- for (var i$3 = 1, prev$1 = types[0]; i$3 < len - 1; ++i$3) {
- var type$2 = types[i$3]
- if (type$2 == "+" && prev$1 == "1" && types[i$3+1] == "1") { types[i$3] = "1" }
- else if (type$2 == "," && prev$1 == types[i$3+1] &&
- (prev$1 == "1" || prev$1 == "n")) { types[i$3] = prev$1 }
- prev$1 = type$2
- }
-
- // W5. A sequence of European terminators adjacent to European
- // numbers changes to all European numbers.
- // W6. Otherwise, separators and terminators change to Other
- // Neutral.
- for (var i$4 = 0; i$4 < len; ++i$4) {
- var type$3 = types[i$4]
- if (type$3 == ",") { types[i$4] = "N" }
- else if (type$3 == "%") {
- var end = (void 0)
- for (end = i$4 + 1; end < len && types[end] == "%"; ++end) {}
- var replace = (i$4 && types[i$4-1] == "!") || (end < len && types[end] == "1") ? "1" : "N"
- for (var j = i$4; j < end; ++j) { types[j] = replace }
- i$4 = end - 1
- }
- }
-
- // W7. Search backwards from each instance of a European number
- // until the first strong type (R, L, or sor) is found. If an L is
- // found, then change the type of the European number to L.
- for (var i$5 = 0, cur$1 = outerType; i$5 < len; ++i$5) {
- var type$4 = types[i$5]
- if (cur$1 == "L" && type$4 == "1") { types[i$5] = "L" }
- else if (isStrong.test(type$4)) { cur$1 = type$4 }
- }
-
- // N1. A sequence of neutrals takes the direction of the
- // surrounding strong text if the text on both sides has the same
- // direction. European and Arabic numbers act as if they were R in
- // terms of their influence on neutrals. Start-of-level-run (sor)
- // and end-of-level-run (eor) are used at level run boundaries.
- // N2. Any remaining neutrals take the embedding direction.
- for (var i$6 = 0; i$6 < len; ++i$6) {
- if (isNeutral.test(types[i$6])) {
- var end$1 = (void 0)
- for (end$1 = i$6 + 1; end$1 < len && isNeutral.test(types[end$1]); ++end$1) {}
- var before = (i$6 ? types[i$6-1] : outerType) == "L"
- var after = (end$1 < len ? types[end$1] : outerType) == "L"
- var replace$1 = before || after ? "L" : "R"
- for (var j$1 = i$6; j$1 < end$1; ++j$1) { types[j$1] = replace$1 }
- i$6 = end$1 - 1
- }
- }
-
- // Here we depart from the documented algorithm, in order to avoid
- // building up an actual levels array. Since there are only three
- // levels (0, 1, 2) in an implementation that doesn't take
- // explicit embedding into account, we can build up the order on
- // the fly, without following the level-based algorithm.
- var order = [], m
- for (var i$7 = 0; i$7 < len;) {
- if (countsAsLeft.test(types[i$7])) {
- var start = i$7
- 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
- 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)) }
- 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))
- pos = j$2
- } else { ++j$2 }
- }
- if (pos < i$7) { order.splice(at, 0, new BidiSpan(1, pos, i$7)) }
- }
- }
- if (order[0].level == 1 && (m = str.match(/^\s+/))) {
- order[0].from = m[0].length
- order.unshift(new BidiSpan(0, 0, m[0].length))
- }
- if (lst(order).level == 1 && (m = str.match(/\s+$/))) {
- lst(order).to -= m[0].length
- order.push(new BidiSpan(0, len - m[0].length, len))
- }
- if (order[0].level == 2)
- { order.unshift(new BidiSpan(1, order[0].to, order[0].to)) }
- if (order[0].level != lst(order).level)
- { order.push(new BidiSpan(order[0].level, len, len)) }
-
- return order
- }
-})()
-
-// Get the bidi ordering for the given line (and cache it). Returns
-// false for lines that are fully left-to-right, and an array of
-// BidiSpan objects otherwise.
-function getOrder(line) {
- var order = line.order
- if (order == null) { order = line.order = bidiOrdering(line.text) }
- return order
-}
-
-// EVENT HANDLING
-
-// Lightweight event framework. on/off also work on DOM nodes,
-// registering native DOM handlers.
-
-var noHandlers = []
-
-var on = function(emitter, type, f) {
- if (emitter.addEventListener) {
- emitter.addEventListener(type, f, false)
- } else if (emitter.attachEvent) {
- emitter.attachEvent("on" + type, f)
- } else {
- var map = emitter._handlers || (emitter._handlers = {})
- map[type] = (map[type] || noHandlers).concat(f)
- }
-}
-
-function getHandlers(emitter, type) {
- return emitter._handlers && emitter._handlers[type] || noHandlers
-}
-
-function off(emitter, type, f) {
- if (emitter.removeEventListener) {
- emitter.removeEventListener(type, f, false)
- } else if (emitter.detachEvent) {
- emitter.detachEvent("on" + type, f)
- } else {
- var map = emitter._handlers, arr = map && map[type]
- if (arr) {
- var index = indexOf(arr, f)
- if (index > -1)
- { map[type] = arr.slice(0, index).concat(arr.slice(index + 1)) }
- }
- }
-}
-
-function signal(emitter, type /*, values...*/) {
- var handlers = getHandlers(emitter, type)
- if (!handlers.length) { return }
- var args = Array.prototype.slice.call(arguments, 2)
- for (var i = 0; i < handlers.length; ++i) { handlers[i].apply(null, args) }
-}
-
-// The DOM events that CodeMirror handles can be overridden by
-// registering a (non-DOM) handler on the editor for the event name,
-// and preventDefault-ing the event in that handler.
-function signalDOMEvent(cm, e, override) {
- if (typeof e == "string")
- { e = {type: e, preventDefault: function() { this.defaultPrevented = true }} }
- signal(cm, override || e.type, cm, e)
- return e_defaultPrevented(e) || e.codemirrorIgnore
-}
-
-function signalCursorActivity(cm) {
- var arr = cm._handlers && cm._handlers.cursorActivity
- if (!arr) { return }
- var set = cm.curOp.cursorActivityHandlers || (cm.curOp.cursorActivityHandlers = [])
- for (var i = 0; i < arr.length; ++i) { if (indexOf(set, arr[i]) == -1)
- { set.push(arr[i]) } }
-}
-
-function hasHandler(emitter, type) {
- return getHandlers(emitter, type).length > 0
-}
-
-// Add on and off methods to a constructor's prototype, to make
-// registering events on such objects more convenient.
-function eventMixin(ctor) {
- ctor.prototype.on = function(type, f) {on(this, type, f)}
- ctor.prototype.off = function(type, f) {off(this, type, f)}
-}
-
-// Due to the fact that we still support jurassic IE versions, some
-// compatibility wrappers are needed.
-
-function e_preventDefault(e) {
- if (e.preventDefault) { e.preventDefault() }
- else { e.returnValue = false }
-}
-function e_stopPropagation(e) {
- if (e.stopPropagation) { e.stopPropagation() }
- else { e.cancelBubble = true }
-}
-function e_defaultPrevented(e) {
- return e.defaultPrevented != null ? e.defaultPrevented : e.returnValue == false
-}
-function e_stop(e) {e_preventDefault(e); e_stopPropagation(e)}
-
-function e_target(e) {return e.target || e.srcElement}
-function e_button(e) {
- var b = e.which
- if (b == null) {
- if (e.button & 1) { b = 1 }
- else if (e.button & 2) { b = 3 }
- else if (e.button & 4) { b = 2 }
- }
- if (mac && e.ctrlKey && b == 1) { b = 3 }
- return b
-}
-
-// Detect drag-and-drop
-var dragAndDrop = function() {
- // There is *some* kind of drag-and-drop support in IE6-8, but I
- // couldn't get it to work yet.
- if (ie && ie_version < 9) { return false }
- var div = elt('div')
- return "draggable" in div || "dragDrop" in div
-}()
-
-var zwspSupported
-function zeroWidthElement(measure) {
- if (zwspSupported == null) {
- var test = elt("span", "\u200b")
- removeChildrenAndAdd(measure, elt("span", [test, document.createTextNode("x")]))
- if (measure.firstChild.offsetHeight != 0)
- { zwspSupported = test.offsetWidth <= 1 && test.offsetHeight > 2 && !(ie && ie_version < 8) }
- }
- var node = zwspSupported ? elt("span", "\u200b") :
- elt("span", "\u00a0", null, "display: inline-block; width: 1px; margin-right: -1px")
- node.setAttribute("cm-text", "")
- return node
-}
-
-// Feature-detect IE's crummy client rect reporting for bidi text
-var badBidiRects
-function hasBadBidiRects(measure) {
- if (badBidiRects != null) { return badBidiRects }
- var txt = removeChildrenAndAdd(measure, document.createTextNode("A\u062eA"))
- var r0 = range(txt, 0, 1).getBoundingClientRect()
- var r1 = range(txt, 1, 2).getBoundingClientRect()
- removeChildren(measure)
- if (!r0 || r0.left == r0.right) { return false } // Safari returns null in some cases (#2780)
- return badBidiRects = (r1.right - r0.right < 3)
-}
-
-// See if "".split is the broken IE version, if so, provide an
-// alternative way to split lines.
-var splitLinesAuto = "\n\nb".split(/\n/).length != 3 ? function (string) {
- var pos = 0, result = [], l = string.length
- while (pos <= l) {
- var nl = string.indexOf("\n", pos)
- if (nl == -1) { nl = string.length }
- var line = string.slice(pos, string.charAt(nl - 1) == "\r" ? nl - 1 : nl)
- var rt = line.indexOf("\r")
- if (rt != -1) {
- result.push(line.slice(0, rt))
- pos += rt + 1
- } else {
- result.push(line)
- pos = nl + 1
- }
- }
- return result
-} : function (string) { return string.split(/\r\n?|\n/); }
-
-var hasSelection = window.getSelection ? function (te) {
- try { return te.selectionStart != te.selectionEnd }
- catch(e) { return false }
-} : function (te) {
- var range
- try {range = te.ownerDocument.selection.createRange()}
- catch(e) {}
- if (!range || range.parentElement() != te) { return false }
- return range.compareEndPoints("StartToEnd", range) != 0
-}
-
-var hasCopyEvent = (function () {
- var e = elt("div")
- if ("oncopy" in e) { return true }
- e.setAttribute("oncopy", "return;")
- return typeof e.oncopy == "function"
-})()
-
-var badZoomedRects = null
-function hasBadZoomedRects(measure) {
- if (badZoomedRects != null) { return badZoomedRects }
- var node = removeChildrenAndAdd(measure, elt("span", "x"))
- var normal = node.getBoundingClientRect()
- var fromRange = range(node, 0, 1).getBoundingClientRect()
- return badZoomedRects = Math.abs(normal.left - fromRange.left) > 1
-}
-
-var modes = {};
-var mimeModes = {};
-// Extra arguments are stored as the mode's dependencies, which is
-// used by (legacy) mechanisms like loadmode.js to automatically
-// load a mode. (Preferred mechanism is the require/define calls.)
-function defineMode(name, mode) {
- if (arguments.length > 2)
- { mode.dependencies = Array.prototype.slice.call(arguments, 2) }
- modes[name] = mode
-}
-
-function defineMIME(mime, spec) {
- mimeModes[mime] = spec
-}
-
-// Given a MIME type, a {name, ...options} config object, or a name
-// string, return a mode config object.
-function resolveMode(spec) {
- if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) {
- spec = mimeModes[spec]
- } else if (spec && typeof spec.name == "string" && mimeModes.hasOwnProperty(spec.name)) {
- var found = mimeModes[spec.name]
- if (typeof found == "string") { found = {name: found} }
- spec = createObj(found, spec)
- spec.name = found.name
- } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+xml$/.test(spec)) {
- return resolveMode("application/xml")
- } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+json$/.test(spec)) {
- return resolveMode("application/json")
- }
- if (typeof spec == "string") { return {name: spec} }
- else { return spec || {name: "null"} }
-}
-
-// Given a mode spec (anything that resolveMode accepts), find and
-// initialize an actual mode object.
-function getMode(options, spec) {
- spec = resolveMode(spec)
- var mfactory = modes[spec.name]
- if (!mfactory) { return getMode(options, "text/plain") }
- var modeObj = mfactory(options, spec)
- if (modeExtensions.hasOwnProperty(spec.name)) {
- var exts = modeExtensions[spec.name]
- for (var prop in exts) {
- if (!exts.hasOwnProperty(prop)) { continue }
- if (modeObj.hasOwnProperty(prop)) { modeObj["_" + prop] = modeObj[prop] }
- modeObj[prop] = exts[prop]
- }
- }
- modeObj.name = spec.name
- if (spec.helperType) { modeObj.helperType = spec.helperType }
- if (spec.modeProps) { for (var prop$1 in spec.modeProps)
- { modeObj[prop$1] = spec.modeProps[prop$1] } }
-
- return modeObj
-}
-
-// This can be used to attach properties to mode objects from
-// outside the actual mode definition.
-var modeExtensions = {}
-function extendMode(mode, properties) {
- var exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : (modeExtensions[mode] = {})
- copyObj(properties, exts)
-}
-
-function copyState(mode, state) {
- if (state === true) { return state }
- if (mode.copyState) { return mode.copyState(state) }
- var nstate = {}
- for (var n in state) {
- var val = state[n]
- if (val instanceof Array) { val = val.concat([]) }
- nstate[n] = val
- }
- return nstate
-}
-
-// Given a mode and a state (for that mode), find the inner mode and
-// state at the position that the state refers to.
-function innerMode(mode, state) {
- var info
- while (mode.innerMode) {
- info = mode.innerMode(state)
- if (!info || info.mode == mode) { break }
- state = info.state
- mode = info.mode
- }
- return info || {mode: mode, state: state}
-}
-
-function startState(mode, a1, a2) {
- return mode.startState ? mode.startState(a1, a2) : true
-}
-
-// STRING STREAM
-
-// Fed to the mode parsers, provides helper functions to make
-// parsers more succinct.
-
-var StringStream = function(string, tabSize) {
- this.pos = this.start = 0
- this.string = string
- this.tabSize = tabSize || 8
- this.lastColumnPos = this.lastColumnValue = 0
- this.lineStart = 0
-}
-
-StringStream.prototype = {
- eol: function() {return this.pos >= this.string.length},
- sol: function() {return this.pos == this.lineStart},
- peek: function() {return this.string.charAt(this.pos) || undefined},
- next: function() {
- if (this.pos < this.string.length)
- { return this.string.charAt(this.pos++) }
- },
- eat: function(match) {
- var ch = this.string.charAt(this.pos)
- var ok
- if (typeof match == "string") { ok = ch == match }
- else { ok = ch && (match.test ? match.test(ch) : match(ch)) }
- if (ok) {++this.pos; return ch}
- },
- eatWhile: function(match) {
- var start = this.pos
- while (this.eat(match)){}
- return this.pos > start
- },
- eatSpace: function() {
- var this$1 = this;
-
- var start = this.pos
- while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) { ++this$1.pos }
- return this.pos > start
- },
- skipToEnd: function() {this.pos = this.string.length},
- skipTo: function(ch) {
- var found = this.string.indexOf(ch, this.pos)
- if (found > -1) {this.pos = found; return true}
- },
- backUp: function(n) {this.pos -= n},
- column: function() {
- if (this.lastColumnPos < this.start) {
- this.lastColumnValue = countColumn(this.string, this.start, this.tabSize, this.lastColumnPos, this.lastColumnValue)
- this.lastColumnPos = this.start
- }
- return this.lastColumnValue - (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0)
- },
- indentation: function() {
- return countColumn(this.string, null, this.tabSize) -
- (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0)
- },
- match: function(pattern, consume, caseInsensitive) {
- if (typeof pattern == "string") {
- var cased = function (str) { return caseInsensitive ? str.toLowerCase() : str; }
- var substr = this.string.substr(this.pos, pattern.length)
- if (cased(substr) == cased(pattern)) {
- if (consume !== false) { this.pos += pattern.length }
- return true
- }
- } else {
- var match = this.string.slice(this.pos).match(pattern)
- if (match && match.index > 0) { return null }
- if (match && consume !== false) { this.pos += match[0].length }
- return match
- }
- },
- current: function(){return this.string.slice(this.start, this.pos)},
- hideFirstChars: function(n, inner) {
- this.lineStart += n
- try { return inner() }
- finally { this.lineStart -= n }
- }
-}
-
-// Compute a style array (an array starting with a mode generation
-// -- for invalidation -- followed by pairs of end positions and
-// style strings), which is used to highlight the tokens on the
-// line.
-function highlightLine(cm, line, state, forceToEnd) {
- // A styles array always starts with a number identifying the
- // mode/overlays that it is based on (for easy invalidation).
- var st = [cm.state.modeGen], lineClasses = {}
- // Compute the base array of styles
- runMode(cm, line.text, cm.doc.mode, state, function (end, style) { return st.push(end, style); },
- lineClasses, forceToEnd)
-
- // Run overlays, adjust style array.
- var loop = function ( o ) {
- var overlay = cm.state.overlays[o], i = 1, at = 0
- runMode(cm, line.text, overlay.mode, true, function (end, style) {
- var start = i
- // Ensure there's a token end at the current position, and that i points at it
- while (at < end) {
- var i_end = st[i]
- if (i_end > end)
- { st.splice(i, 1, end, st[i+1], i_end) }
- i += 2
- at = Math.min(end, i_end)
- }
- if (!style) { return }
- if (overlay.opaque) {
- st.splice(start, i - start, end, "overlay " + style)
- i = start + 2
- } else {
- for (; start < i; start += 2) {
- var cur = st[start+1]
- st[start+1] = (cur ? cur + " " : "") + "overlay " + style
- }
- }
- }, lineClasses)
- };
-
- for (var o = 0; o < cm.state.overlays.length; ++o) loop( o );
-
- return {styles: st, classes: lineClasses.bgClass || lineClasses.textClass ? lineClasses : null}
-}
-
-function getLineStyles(cm, line, updateFrontier) {
- if (!line.styles || line.styles[0] != cm.state.modeGen) {
- var state = getStateBefore(cm, lineNo(line))
- var result = highlightLine(cm, line, line.text.length > cm.options.maxHighlightLength ? copyState(cm.doc.mode, state) : state)
- line.stateAfter = state
- line.styles = result.styles
- if (result.classes) { line.styleClasses = result.classes }
- else if (line.styleClasses) { line.styleClasses = null }
- if (updateFrontier === cm.doc.frontier) { cm.doc.frontier++ }
- }
- return line.styles
-}
-
-function getStateBefore(cm, n, precise) {
- var doc = cm.doc, display = cm.display
- if (!doc.mode.startState) { return true }
- var pos = findStartLine(cm, n, precise), state = pos > doc.first && getLine(doc, pos-1).stateAfter
- if (!state) { state = startState(doc.mode) }
- else { state = copyState(doc.mode, state) }
- doc.iter(pos, n, function (line) {
- processLine(cm, line.text, state)
- var save = pos == n - 1 || pos % 5 == 0 || pos >= display.viewFrom && pos < display.viewTo
- line.stateAfter = save ? copyState(doc.mode, state) : null
- ++pos
- })
- if (precise) { doc.frontier = pos }
- return state
-}
-
-// Lightweight form of highlight -- proceed over this line and
-// update state, but don't save a style array. Used for lines that
-// aren't currently visible.
-function processLine(cm, text, state, startAt) {
- var mode = cm.doc.mode
- var stream = new StringStream(text, cm.options.tabSize)
- stream.start = stream.pos = startAt || 0
- if (text == "") { callBlankLine(mode, state) }
- while (!stream.eol()) {
- readToken(mode, stream, state)
- stream.start = stream.pos
- }
-}
-
-function callBlankLine(mode, state) {
- if (mode.blankLine) { return mode.blankLine(state) }
- if (!mode.innerMode) { return }
- var inner = innerMode(mode, state)
- if (inner.mode.blankLine) { return inner.mode.blankLine(inner.state) }
-}
-
-function readToken(mode, stream, state, inner) {
- for (var i = 0; i < 10; i++) {
- if (inner) { inner[0] = innerMode(mode, state).mode }
- var style = mode.token(stream, state)
- if (stream.pos > stream.start) { return style }
- }
- throw new Error("Mode " + mode.name + " failed to advance stream.")
-}
-
-// Utility for getTokenAt and getLineTokens
-function takeToken(cm, pos, precise, asArray) {
- var getObj = function (copy) { return ({
- start: stream.start, end: stream.pos,
- string: stream.current(),
- type: style || null,
- state: copy ? copyState(doc.mode, state) : state
- }); }
-
- var doc = cm.doc, mode = doc.mode, style
- pos = clipPos(doc, pos)
- var line = getLine(doc, pos.line), state = getStateBefore(cm, pos.line, precise)
- var stream = new StringStream(line.text, cm.options.tabSize), tokens
- if (asArray) { tokens = [] }
- while ((asArray || stream.pos < pos.ch) && !stream.eol()) {
- stream.start = stream.pos
- style = readToken(mode, stream, state)
- if (asArray) { tokens.push(getObj(true)) }
- }
- return asArray ? tokens : getObj()
-}
-
-function extractLineClasses(type, output) {
- if (type) { for (;;) {
- var lineClass = type.match(/(?:^|\s+)line-(background-)?(\S+)/)
- if (!lineClass) { break }
- type = type.slice(0, lineClass.index) + type.slice(lineClass.index + lineClass[0].length)
- 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]))
- { output[prop] += " " + lineClass[2] }
- } }
- return type
-}
-
-// Run the given mode's parser over a line, calling f for each token.
-function runMode(cm, text, mode, state, f, lineClasses, forceToEnd) {
- var flattenSpans = mode.flattenSpans
- if (flattenSpans == null) { flattenSpans = cm.options.flattenSpans }
- var curStart = 0, curStyle = null
- var stream = new StringStream(text, cm.options.tabSize), style
- var inner = cm.options.addModeClass && [null]
- if (text == "") { extractLineClasses(callBlankLine(mode, state), lineClasses) }
- while (!stream.eol()) {
- if (stream.pos > cm.options.maxHighlightLength) {
- flattenSpans = false
- if (forceToEnd) { processLine(cm, text, state, stream.pos) }
- stream.pos = text.length
- style = null
- } else {
- style = extractLineClasses(readToken(mode, stream, state, inner), lineClasses)
- }
- if (inner) {
- var mName = inner[0].name
- if (mName) { style = "m-" + (style ? mName + " " + style : mName) }
- }
- if (!flattenSpans || curStyle != style) {
- while (curStart < stream.start) {
- curStart = Math.min(stream.start, curStart + 5000)
- f(curStart, curStyle)
- }
- curStyle = style
- }
- stream.start = stream.pos
- }
- while (curStart < stream.pos) {
- // Webkit seems to refuse to render text nodes longer than 57444
- // characters, and returns inaccurate measurements in nodes
- // starting around 5000 chars.
- var pos = Math.min(stream.pos, curStart + 5000)
- f(pos, curStyle)
- curStart = pos
- }
-}
-
-// Finds the line to start with when starting a parse. Tries to
-// find a line with a stateAfter, so that it can start with a
-// valid state. If that fails, it returns the line with the
-// smallest indentation, which tends to need the least context to
-// parse correctly.
-function findStartLine(cm, n, precise) {
- var minindent, minline, doc = cm.doc
- var lim = precise ? -1 : n - (cm.doc.mode.innerMode ? 1000 : 100)
- for (var search = n; search > lim; --search) {
- if (search <= doc.first) { return doc.first }
- var line = getLine(doc, search - 1)
- if (line.stateAfter && (!precise || search <= doc.frontier)) { return search }
- var indented = countColumn(line.text, null, cm.options.tabSize)
- if (minline == null || minindent > indented) {
- minline = search - 1
- minindent = indented
- }
- }
- return minline
-}
-
-// LINE DATA STRUCTURE
-
-// Line objects. These hold state related to a line, including
-// highlighting info (the styles array).
-function Line(text, markedSpans, estimateHeight) {
- this.text = text
- attachMarkedSpans(this, markedSpans)
- this.height = estimateHeight ? estimateHeight(this) : 1
-}
-eventMixin(Line)
-Line.prototype.lineNo = function() { return lineNo(this) }
-
-// Change the content (text, markers) of a line. Automatically
-// invalidates cached information and tries to re-estimate the
-// line's height.
-function updateLine(line, text, markedSpans, estimateHeight) {
- line.text = text
- if (line.stateAfter) { line.stateAfter = null }
- if (line.styles) { line.styles = null }
- if (line.order != null) { line.order = null }
- detachMarkedSpans(line)
- attachMarkedSpans(line, markedSpans)
- var estHeight = estimateHeight ? estimateHeight(line) : 1
- if (estHeight != line.height) { updateLineHeight(line, estHeight) }
-}
-
-// Detach a line from the document tree and its markers.
-function cleanUpLine(line) {
- line.parent = null
- detachMarkedSpans(line)
-}
-
-// Convert a style as returned by a mode (either null, or a string
-// containing one or more styles) to a CSS style. This is cached,
-// and also looks for line-wide styles.
-var styleToClassCache = {};
-var styleToClassCacheWithMode = {};
-function interpretTokenStyle(style, options) {
- if (!style || /^\s*$/.test(style)) { return null }
- var cache = options.addModeClass ? styleToClassCacheWithMode : styleToClassCache
- return cache[style] ||
- (cache[style] = style.replace(/\S+/g, "cm-$&"))
-}
-
-// Render the DOM representation of the text of a line. Also builds
-// up a 'line map', which points at the DOM nodes that represent
-// specific stretches of text, and is used by the measuring code.
-// The returned object contains the DOM node, this map, and
-// information about line-wide styles that were set by the mode.
-function buildLineContent(cm, lineView) {
- // The padding-right forces the element to have a 'border', which
- // is needed on Webkit to be able to get line-level bounding
- // rectangles for it (in measureChar).
- var content = elt("span", null, null, webkit ? "padding-right: .1px" : null)
- var builder = {pre: elt("pre", [content], "CodeMirror-line"), content: content,
- col: 0, pos: 0, cm: cm,
- trailingSpace: false,
- splitSpaces: (ie || webkit) && cm.getOption("lineWrapping")}
- // hide from accessibility tree
- content.setAttribute("role", "presentation")
- builder.pre.setAttribute("role", "presentation")
- lineView.measure = {}
-
- // Iterate over the logical lines that make up this visual line.
- for (var i = 0; i <= (lineView.rest ? lineView.rest.length : 0); i++) {
- var line = i ? lineView.rest[i - 1] : lineView.line, order = (void 0)
- builder.pos = 0
- builder.addToken = buildToken
- // Optionally wire in some hacks into the token-rendering
- // algorithm, to deal with browser quirks.
- if (hasBadBidiRects(cm.display.measure) && (order = getOrder(line)))
- { builder.addToken = buildTokenBadBidi(builder.addToken, order) }
- builder.map = []
- var allowFrontierUpdate = lineView != cm.display.externalMeasured && lineNo(line)
- insertLineContent(line, builder, getLineStyles(cm, line, allowFrontierUpdate))
- if (line.styleClasses) {
- if (line.styleClasses.bgClass)
- { builder.bgClass = joinClasses(line.styleClasses.bgClass, builder.bgClass || "") }
- if (line.styleClasses.textClass)
- { builder.textClass = joinClasses(line.styleClasses.textClass, builder.textClass || "") }
- }
-
- // Ensure at least a single node is present, for measuring.
- if (builder.map.length == 0)
- { builder.map.push(0, 0, builder.content.appendChild(zeroWidthElement(cm.display.measure))) }
-
- // Store the map and a cache object for the current logical line
- if (i == 0) {
- lineView.measure.map = builder.map
- lineView.measure.cache = {}
- } else {
- ;(lineView.measure.maps || (lineView.measure.maps = [])).push(builder.map)
- ;(lineView.measure.caches || (lineView.measure.caches = [])).push({})
- }
- }
-
- // See issue #2901
- if (webkit) {
- var last = builder.content.lastChild
- if (/\bcm-tab\b/.test(last.className) || (last.querySelector && last.querySelector(".cm-tab")))
- { builder.content.className = "cm-tab-wrap-hack" }
- }
-
- signal(cm, "renderLine", cm, lineView.line, builder.pre)
- if (builder.pre.className)
- { builder.textClass = joinClasses(builder.pre.className, builder.textClass || "") }
-
- return builder
-}
-
-function defaultSpecialCharPlaceholder(ch) {
- var token = elt("span", "\u2022", "cm-invalidchar")
- token.title = "\\u" + ch.charCodeAt(0).toString(16)
- token.setAttribute("aria-label", token.title)
- return token
-}
-
-// Build up the DOM representation for a single token, and add it to
-// the line map. Takes care to render special characters separately.
-function buildToken(builder, text, style, startStyle, endStyle, title, css) {
- if (!text) { return }
- var displayText = builder.splitSpaces ? splitSpaces(text, builder.trailingSpace) : text
- var special = builder.cm.state.specialChars, mustWrap = false
- var content
- if (!special.test(text)) {
- builder.col += text.length
- content = document.createTextNode(displayText)
- builder.map.push(builder.pos, builder.pos + text.length, content)
- if (ie && ie_version < 9) { mustWrap = true }
- builder.pos += text.length
- } else {
- content = document.createDocumentFragment()
- var pos = 0
- while (true) {
- special.lastIndex = pos
- var m = special.exec(text)
- var skipped = m ? m.index - pos : text.length - pos
- if (skipped) {
- var txt = document.createTextNode(displayText.slice(pos, pos + skipped))
- if (ie && ie_version < 9) { content.appendChild(elt("span", [txt])) }
- else { content.appendChild(txt) }
- builder.map.push(builder.pos, builder.pos + skipped, txt)
- builder.col += skipped
- builder.pos += skipped
- }
- if (!m) { break }
- pos += skipped + 1
- var txt$1 = (void 0)
- if (m[0] == "\t") {
- var tabSize = builder.cm.options.tabSize, tabWidth = tabSize - builder.col % tabSize
- txt$1 = content.appendChild(elt("span", spaceStr(tabWidth), "cm-tab"))
- txt$1.setAttribute("role", "presentation")
- txt$1.setAttribute("cm-text", "\t")
- builder.col += tabWidth
- } else if (m[0] == "\r" || m[0] == "\n") {
- txt$1 = content.appendChild(elt("span", m[0] == "\r" ? "\u240d" : "\u2424", "cm-invalidchar"))
- txt$1.setAttribute("cm-text", m[0])
- builder.col += 1
- } else {
- txt$1 = builder.cm.options.specialCharPlaceholder(m[0])
- txt$1.setAttribute("cm-text", m[0])
- if (ie && ie_version < 9) { content.appendChild(elt("span", [txt$1])) }
- else { content.appendChild(txt$1) }
- builder.col += 1
- }
- builder.map.push(builder.pos, builder.pos + 1, txt$1)
- builder.pos++
- }
- }
- builder.trailingSpace = displayText.charCodeAt(text.length - 1) == 32
- if (style || startStyle || endStyle || mustWrap || css) {
- var fullStyle = style || ""
- if (startStyle) { fullStyle += startStyle }
- if (endStyle) { fullStyle += endStyle }
- var token = elt("span", [content], fullStyle, css)
- if (title) { token.title = title }
- return builder.content.appendChild(token)
- }
- builder.content.appendChild(content)
-}
-
-function splitSpaces(text, trailingBefore) {
- if (text.length > 1 && !/ /.test(text)) { return text }
- var spaceBefore = trailingBefore, result = ""
- for (var i = 0; i < text.length; i++) {
- var ch = text.charAt(i)
- if (ch == " " && spaceBefore && (i == text.length - 1 || text.charCodeAt(i + 1) == 32))
- { ch = "\u00a0" }
- result += ch
- spaceBefore = ch == " "
- }
- return result
-}
-
-// Work around nonsense dimensions being reported for stretches of
-// right-to-left text.
-function buildTokenBadBidi(inner, order) {
- return function (builder, text, style, startStyle, endStyle, title, css) {
- style = style ? style + " cm-force-border" : "cm-force-border"
- var start = builder.pos, end = start + text.length
- for (;;) {
- // Find the part that overlaps with the start of this text
- var part = (void 0)
- for (var i = 0; i < order.length; i++) {
- part = order[i]
- if (part.to > start && part.from <= start) { break }
- }
- if (part.to >= end) { return inner(builder, text, style, startStyle, endStyle, title, css) }
- inner(builder, text.slice(0, part.to - start), style, startStyle, null, title, css)
- startStyle = null
- text = text.slice(part.to - start)
- start = part.to
- }
- }
-}
-
-function buildCollapsedSpan(builder, size, marker, ignoreWidget) {
- var widget = !ignoreWidget && marker.widgetNode
- if (widget) { builder.map.push(builder.pos, builder.pos + size, widget) }
- if (!ignoreWidget && builder.cm.display.input.needsContentAttribute) {
- if (!widget)
- { widget = builder.content.appendChild(document.createElement("span")) }
- widget.setAttribute("cm-marker", marker.id)
- }
- if (widget) {
- builder.cm.display.input.setUneditable(widget)
- builder.content.appendChild(widget)
- }
- builder.pos += size
- builder.trailingSpace = false
-}
-
-// Outputs a number of spans to make up a line, taking highlighting
-// and marked text into account.
-function insertLineContent(line, builder, styles) {
- var spans = line.markedSpans, allText = line.text, at = 0
- if (!spans) {
- for (var i$1 = 1; i$1 < styles.length; i$1+=2)
- { builder.addToken(builder, allText.slice(at, at = styles[i$1]), interpretTokenStyle(styles[i$1+1], builder.cm.options)) }
- return
- }
-
- var len = allText.length, pos = 0, i = 1, text = "", style, css
- var nextChange = 0, spanStyle, spanEndStyle, spanStartStyle, title, collapsed
- for (;;) {
- if (nextChange == pos) { // Update current marker set
- spanStyle = spanEndStyle = spanStartStyle = title = css = ""
- collapsed = null; nextChange = Infinity
- var foundBookmarks = [], endStyles = (void 0)
- for (var j = 0; j < spans.length; ++j) {
- var sp = spans[j], m = sp.marker
- if (m.type == "bookmark" && sp.from == pos && m.widgetNode) {
- foundBookmarks.push(m)
- } else if (sp.from <= pos && (sp.to == null || sp.to > pos || m.collapsed && sp.to == pos && sp.from == pos)) {
- if (sp.to != null && sp.to != pos && nextChange > sp.to) {
- nextChange = sp.to
- spanEndStyle = ""
- }
- if (m.className) { spanStyle += " " + m.className }
- if (m.css) { css = (css ? css + ";" : "") + m.css }
- if (m.startStyle && sp.from == pos) { spanStartStyle += " " + m.startStyle }
- if (m.endStyle && sp.to == nextChange) { (endStyles || (endStyles = [])).push(m.endStyle, sp.to) }
- if (m.title && !title) { title = m.title }
- if (m.collapsed && (!collapsed || compareCollapsedMarkers(collapsed.marker, m) < 0))
- { collapsed = sp }
- } else if (sp.from > pos && nextChange > sp.from) {
- nextChange = sp.from
- }
- }
- if (endStyles) { for (var j$1 = 0; j$1 < endStyles.length; j$1 += 2)
- { if (endStyles[j$1 + 1] == nextChange) { spanEndStyle += " " + endStyles[j$1] } } }
-
- if (!collapsed || collapsed.from == pos) { for (var j$2 = 0; j$2 < foundBookmarks.length; ++j$2)
- { buildCollapsedSpan(builder, 0, foundBookmarks[j$2]) } }
- if (collapsed && (collapsed.from || 0) == pos) {
- buildCollapsedSpan(builder, (collapsed.to == null ? len + 1 : collapsed.to) - pos,
- collapsed.marker, collapsed.from == null)
- if (collapsed.to == null) { return }
- if (collapsed.to == pos) { collapsed = false }
- }
- }
- if (pos >= len) { break }
-
- var upto = Math.min(len, nextChange)
- while (true) {
- if (text) {
- var end = pos + text.length
- if (!collapsed) {
- var tokenText = end > upto ? text.slice(0, upto - pos) : text
- builder.addToken(builder, tokenText, style ? style + spanStyle : spanStyle,
- spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : "", title, css)
- }
- if (end >= upto) {text = text.slice(upto - pos); pos = upto; break}
- pos = end
- spanStartStyle = ""
- }
- text = allText.slice(at, at = styles[i++])
- style = interpretTokenStyle(styles[i++], builder.cm.options)
- }
- }
-}
-
-
-// These objects are used to represent the visible (currently drawn)
-// part of the document. A LineView may correspond to multiple
-// logical lines, if those are connected by collapsed ranges.
-function LineView(doc, line, lineN) {
- // The starting line
- this.line = line
- // Continuing lines, if any
- this.rest = visualLineContinued(line)
- // Number of logical lines in this visual line
- this.size = this.rest ? lineNo(lst(this.rest)) - lineN + 1 : 1
- this.node = this.text = null
- this.hidden = lineIsHidden(doc, line)
-}
-
-// Create a range of LineView objects for the given lines.
-function buildViewArray(cm, from, to) {
- var array = [], nextPos
- for (var pos = from; pos < to; pos = nextPos) {
- var view = new LineView(cm.doc, getLine(cm.doc, pos), pos)
- nextPos = pos + view.size
- array.push(view)
- }
- return array
-}
-
-var operationGroup = null
-
-function pushOperation(op) {
- if (operationGroup) {
- operationGroup.ops.push(op)
- } else {
- op.ownsGroup = operationGroup = {
- ops: [op],
- delayedCallbacks: []
- }
- }
-}
-
-function fireCallbacksForOps(group) {
- // Calls delayed callbacks and cursorActivity handlers until no
- // new ones appear
- var callbacks = group.delayedCallbacks, i = 0
- do {
- for (; i < callbacks.length; i++)
- { callbacks[i].call(null) }
- for (var j = 0; j < group.ops.length; j++) {
- var op = group.ops[j]
- if (op.cursorActivityHandlers)
- { while (op.cursorActivityCalled < op.cursorActivityHandlers.length)
- { op.cursorActivityHandlers[op.cursorActivityCalled++].call(null, op.cm) } }
- }
- } while (i < callbacks.length)
-}
-
-function finishOperation(op, endCb) {
- var group = op.ownsGroup
- if (!group) { return }
-
- try { fireCallbacksForOps(group) }
- finally {
- operationGroup = null
- endCb(group)
- }
-}
-
-var orphanDelayedCallbacks = null
-
-// Often, we want to signal events at a point where we are in the
-// middle of some work, but don't want the handler to start calling
-// other methods on the editor, which might be in an inconsistent
-// state or simply not expect any other events to happen.
-// signalLater looks whether there are any handlers, and schedules
-// them to be executed when the last operation ends, or, if no
-// operation is active, when a timeout fires.
-function signalLater(emitter, type /*, values...*/) {
- var arr = getHandlers(emitter, type)
- if (!arr.length) { return }
- var args = Array.prototype.slice.call(arguments, 2), list
- if (operationGroup) {
- list = operationGroup.delayedCallbacks
- } else if (orphanDelayedCallbacks) {
- list = orphanDelayedCallbacks
- } else {
- list = orphanDelayedCallbacks = []
- setTimeout(fireOrphanDelayed, 0)
- }
- var loop = function ( i ) {
- list.push(function () { return arr[i].apply(null, args); })
- };
-
- for (var i = 0; i < arr.length; ++i)
- loop( i );
-}
-
-function fireOrphanDelayed() {
- var delayed = orphanDelayedCallbacks
- orphanDelayedCallbacks = null
- for (var i = 0; i < delayed.length; ++i) { delayed[i]() }
-}
-
-// When an aspect of a line changes, a string is added to
-// lineView.changes. This updates the relevant part of the line's
-// DOM structure.
-function updateLineForChanges(cm, lineView, lineN, dims) {
- for (var j = 0; j < lineView.changes.length; j++) {
- var type = lineView.changes[j]
- if (type == "text") { updateLineText(cm, lineView) }
- else if (type == "gutter") { updateLineGutter(cm, lineView, lineN, dims) }
- else if (type == "class") { updateLineClasses(lineView) }
- else if (type == "widget") { updateLineWidgets(cm, lineView, dims) }
- }
- lineView.changes = null
-}
-
-// Lines with gutter elements, widgets or a background class need to
-// be wrapped, and have the extra elements added to the wrapper div
-function ensureLineWrapped(lineView) {
- if (lineView.node == lineView.text) {
- lineView.node = elt("div", null, null, "position: relative")
- if (lineView.text.parentNode)
- { lineView.text.parentNode.replaceChild(lineView.node, lineView.text) }
- lineView.node.appendChild(lineView.text)
- if (ie && ie_version < 8) { lineView.node.style.zIndex = 2 }
- }
- return lineView.node
-}
-
-function updateLineBackground(lineView) {
- var cls = lineView.bgClass ? lineView.bgClass + " " + (lineView.line.bgClass || "") : lineView.line.bgClass
- if (cls) { cls += " CodeMirror-linebackground" }
- if (lineView.background) {
- if (cls) { lineView.background.className = cls }
- else { lineView.background.parentNode.removeChild(lineView.background); lineView.background = null }
- } else if (cls) {
- var wrap = ensureLineWrapped(lineView)
- lineView.background = wrap.insertBefore(elt("div", null, cls), wrap.firstChild)
- }
-}
-
-// Wrapper around buildLineContent which will reuse the structure
-// in display.externalMeasured when possible.
-function getLineContent(cm, lineView) {
- var ext = cm.display.externalMeasured
- if (ext && ext.line == lineView.line) {
- cm.display.externalMeasured = null
- lineView.measure = ext.measure
- return ext.built
- }
- return buildLineContent(cm, lineView)
-}
-
-// Redraw the line's text. Interacts with the background and text
-// classes because the mode may output tokens that influence these
-// classes.
-function updateLineText(cm, lineView) {
- var cls = lineView.text.className
- var built = getLineContent(cm, lineView)
- if (lineView.text == lineView.node) { lineView.node = built.pre }
- lineView.text.parentNode.replaceChild(built.pre, lineView.text)
- lineView.text = built.pre
- if (built.bgClass != lineView.bgClass || built.textClass != lineView.textClass) {
- lineView.bgClass = built.bgClass
- lineView.textClass = built.textClass
- updateLineClasses(lineView)
- } else if (cls) {
- lineView.text.className = cls
- }
-}
-
-function updateLineClasses(lineView) {
- updateLineBackground(lineView)
- if (lineView.line.wrapClass)
- { ensureLineWrapped(lineView).className = lineView.line.wrapClass }
- else if (lineView.node != lineView.text)
- { lineView.node.className = "" }
- var textClass = lineView.textClass ? lineView.textClass + " " + (lineView.line.textClass || "") : lineView.line.textClass
- lineView.text.className = textClass || ""
-}
-
-function updateLineGutter(cm, lineView, lineN, dims) {
- if (lineView.gutter) {
- lineView.node.removeChild(lineView.gutter)
- lineView.gutter = null
- }
- if (lineView.gutterBackground) {
- lineView.node.removeChild(lineView.gutterBackground)
- lineView.gutterBackground = null
- }
- if (lineView.line.gutterClass) {
- var wrap = ensureLineWrapped(lineView)
- lineView.gutterBackground = elt("div", null, "CodeMirror-gutter-background " + lineView.line.gutterClass,
- ("left: " + (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px; width: " + (dims.gutterTotalWidth) + "px"))
- wrap.insertBefore(lineView.gutterBackground, lineView.text)
- }
- var markers = lineView.line.gutterMarkers
- if (cm.options.lineNumbers || markers) {
- var wrap$1 = ensureLineWrapped(lineView)
- var gutterWrap = lineView.gutter = elt("div", null, "CodeMirror-gutter-wrapper", ("left: " + (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px"))
- cm.display.input.setUneditable(gutterWrap)
- wrap$1.insertBefore(gutterWrap, lineView.text)
- if (lineView.line.gutterClass)
- { gutterWrap.className += " " + lineView.line.gutterClass }
- if (cm.options.lineNumbers && (!markers || !markers["CodeMirror-linenumbers"]))
- { lineView.lineNumber = gutterWrap.appendChild(
- elt("div", lineNumberFor(cm.options, lineN),
- "CodeMirror-linenumber CodeMirror-gutter-elt",
- ("left: " + (dims.gutterLeft["CodeMirror-linenumbers"]) + "px; width: " + (cm.display.lineNumInnerWidth) + "px"))) }
- if (markers) { for (var k = 0; k < cm.options.gutters.length; ++k) {
- var id = cm.options.gutters[k], found = markers.hasOwnProperty(id) && markers[id]
- if (found)
- { gutterWrap.appendChild(elt("div", [found], "CodeMirror-gutter-elt",
- ("left: " + (dims.gutterLeft[id]) + "px; width: " + (dims.gutterWidth[id]) + "px"))) }
- } }
- }
-}
-
-function updateLineWidgets(cm, lineView, dims) {
- if (lineView.alignable) { lineView.alignable = null }
- for (var node = lineView.node.firstChild, next = (void 0); node; node = next) {
- next = node.nextSibling
- if (node.className == "CodeMirror-linewidget")
- { lineView.node.removeChild(node) }
- }
- insertLineWidgets(cm, lineView, dims)
-}
-
-// Build a line's DOM representation from scratch
-function buildLineElement(cm, lineView, lineN, dims) {
- var built = getLineContent(cm, lineView)
- lineView.text = lineView.node = built.pre
- if (built.bgClass) { lineView.bgClass = built.bgClass }
- if (built.textClass) { lineView.textClass = built.textClass }
-
- updateLineClasses(lineView)
- updateLineGutter(cm, lineView, lineN, dims)
- insertLineWidgets(cm, lineView, dims)
- return lineView.node
-}
-
-// A lineView may contain multiple logical lines (when merged by
-// collapsed spans). The widgets for all of them need to be drawn.
-function insertLineWidgets(cm, lineView, dims) {
- insertLineWidgetsFor(cm, lineView.line, lineView, dims, true)
- if (lineView.rest) { for (var i = 0; i < lineView.rest.length; i++)
- { insertLineWidgetsFor(cm, lineView.rest[i], lineView, dims, false) } }
-}
-
-function insertLineWidgetsFor(cm, line, lineView, dims, allowAbove) {
- 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")
- if (!widget.handleMouseEvents) { node.setAttribute("cm-ignore-events", "true") }
- positionLineWidget(widget, node, lineView, dims)
- cm.display.input.setUneditable(node)
- if (allowAbove && widget.above)
- { wrap.insertBefore(node, lineView.gutter || lineView.text) }
- else
- { wrap.appendChild(node) }
- signalLater(widget, "redraw")
- }
-}
-
-function positionLineWidget(widget, node, lineView, dims) {
- if (widget.noHScroll) {
- ;(lineView.alignable || (lineView.alignable = [])).push(node)
- var width = dims.wrapperWidth
- node.style.left = dims.fixedPos + "px"
- if (!widget.coverGutter) {
- width -= dims.gutterTotalWidth
- node.style.paddingLeft = dims.gutterTotalWidth + "px"
- }
- node.style.width = width + "px"
- }
- if (widget.coverGutter) {
- node.style.zIndex = 5
- node.style.position = "relative"
- if (!widget.noHScroll) { node.style.marginLeft = -dims.gutterTotalWidth + "px" }
- }
-}
-
-function widgetHeight(widget) {
- if (widget.height != null) { return widget.height }
- var cm = widget.doc.cm
- if (!cm) { return 0 }
- if (!contains(document.body, widget.node)) {
- var parentStyle = "position: relative;"
- if (widget.coverGutter)
- { parentStyle += "margin-left: -" + cm.display.gutters.offsetWidth + "px;" }
- if (widget.noHScroll)
- { parentStyle += "width: " + cm.display.wrapper.clientWidth + "px;" }
- removeChildrenAndAdd(cm.display.measure, elt("div", [widget.node], null, parentStyle))
- }
- return widget.height = widget.node.parentNode.offsetHeight
-}
-
-// Return true when the given mouse event happened in a widget
-function eventInWidget(display, e) {
- for (var n = e_target(e); n != display.wrapper; n = n.parentNode) {
- if (!n || (n.nodeType == 1 && n.getAttribute("cm-ignore-events") == "true") ||
- (n.parentNode == display.sizer && n != display.mover))
- { return true }
- }
-}
-
-// POSITION MEASUREMENT
-
-function paddingTop(display) {return display.lineSpace.offsetTop}
-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 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 }
- return data
-}
-
-function scrollGap(cm) { return scrollerGap - cm.display.nativeBarWidth }
-function displayWidth(cm) {
- return cm.display.scroller.clientWidth - scrollGap(cm) - cm.display.barWidth
-}
-function displayHeight(cm) {
- return cm.display.scroller.clientHeight - scrollGap(cm) - cm.display.barHeight
-}
-
-// Ensure the lineView.wrapping.heights array is populated. This is
-// an array of bottom offsets for the lines that make up a drawn
-// line. When lineWrapping is on, there might be more than one
-// height.
-function ensureLineHeights(cm, lineView, rect) {
- var wrapping = cm.options.lineWrapping
- var curWidth = wrapping && displayWidth(cm)
- if (!lineView.measure.heights || wrapping && lineView.measure.width != curWidth) {
- var heights = lineView.measure.heights = []
- if (wrapping) {
- lineView.measure.width = curWidth
- var rects = lineView.text.firstChild.getClientRects()
- for (var i = 0; i < rects.length - 1; i++) {
- var cur = rects[i], next = rects[i + 1]
- if (Math.abs(cur.bottom - next.bottom) > 2)
- { heights.push((cur.bottom + next.top) / 2 - rect.top) }
- }
- }
- heights.push(rect.bottom - rect.top)
- }
-}
-
-// Find a line map (mapping character offsets to text nodes) and a
-// measurement cache for the given line number. (A line view might
-// contain multiple lines when collapsed ranges are present.)
-function mapFromLineView(lineView, line, lineN) {
- if (lineView.line == line)
- { return {map: lineView.measure.map, cache: lineView.measure.cache} }
- for (var i = 0; i < lineView.rest.length; i++)
- { if (lineView.rest[i] == line)
- { return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i]} } }
- for (var i$1 = 0; i$1 < lineView.rest.length; i$1++)
- { if (lineNo(lineView.rest[i$1]) > lineN)
- { return {map: lineView.measure.maps[i$1], cache: lineView.measure.caches[i$1], before: true} } }
-}
-
-// Render a line into the hidden node display.externalMeasured. Used
-// when measurement is needed for a line that's not in the viewport.
-function updateExternalMeasurement(cm, line) {
- line = visualLine(line)
- var lineN = lineNo(line)
- var view = cm.display.externalMeasured = new LineView(cm.doc, line, lineN)
- view.lineN = lineN
- var built = view.built = buildLineContent(cm, view)
- view.text = built.pre
- removeChildrenAndAdd(cm.display.lineMeasure, built.pre)
- return view
-}
-
-// Get a {top, bottom, left, right} box (in line-local coordinates)
-// for a given character.
-function measureChar(cm, line, ch, bias) {
- return measureCharPrepared(cm, prepareMeasureForLine(cm, line), ch, bias)
-}
-
-// Find a line view that corresponds to the given line number.
-function findViewForLine(cm, lineN) {
- if (lineN >= cm.display.viewFrom && lineN < cm.display.viewTo)
- { return cm.display.view[findViewIndex(cm, lineN)] }
- var ext = cm.display.externalMeasured
- if (ext && lineN >= ext.lineN && lineN < ext.lineN + ext.size)
- { return ext }
-}
-
-// Measurement can be split in two steps, the set-up work that
-// applies to the whole line, and the measurement of the actual
-// character. Functions like coordsChar, that need to do a lot of
-// measurements in a row, can thus ensure that the set-up work is
-// only done once.
-function prepareMeasureForLine(cm, line) {
- var lineN = lineNo(line)
- var view = findViewForLine(cm, lineN)
- if (view && !view.text) {
- view = null
- } else if (view && view.changes) {
- updateLineForChanges(cm, view, lineN, getDimensions(cm))
- cm.curOp.forceUpdate = true
- }
- if (!view)
- { view = updateExternalMeasurement(cm, line) }
-
- var info = mapFromLineView(view, line, lineN)
- return {
- line: line, view: view, rect: null,
- map: info.map, cache: info.cache, before: info.before,
- hasHeights: false
- }
-}
-
-// Given a prepared measurement object, measures the position of an
-// actual character (or fetches it from the cache).
-function measureCharPrepared(cm, prepared, ch, bias, varHeight) {
- if (prepared.before) { ch = -1 }
- var key = ch + (bias || ""), found
- if (prepared.cache.hasOwnProperty(key)) {
- found = prepared.cache[key]
- } else {
- if (!prepared.rect)
- { prepared.rect = prepared.view.text.getBoundingClientRect() }
- if (!prepared.hasHeights) {
- ensureLineHeights(cm, prepared.view, prepared.rect)
- prepared.hasHeights = true
- }
- found = measureCharInner(cm, prepared, ch, bias)
- if (!found.bogus) { prepared.cache[key] = found }
- }
- return {left: found.left, right: found.right,
- top: varHeight ? found.rtop : found.top,
- bottom: varHeight ? found.rbottom : found.bottom}
-}
-
-var nullRect = {left: 0, right: 0, top: 0, bottom: 0}
-
-function nodeAndOffsetInLineMap(map, ch, bias) {
- var node, start, end, collapse, mStart, mEnd
- // First, search the line map for the text node corresponding to,
- // or closest to, the target character.
- for (var i = 0; i < map.length; i += 3) {
- mStart = map[i]
- mEnd = map[i + 1]
- if (ch < mStart) {
- start = 0; end = 1
- collapse = "left"
- } else if (ch < mEnd) {
- start = ch - mStart
- end = start + 1
- } else if (i == map.length - 3 || ch == mEnd && map[i + 3] > ch) {
- end = mEnd - mStart
- start = end - 1
- if (ch >= mEnd) { collapse = "right" }
- }
- if (start != null) {
- node = map[i + 2]
- if (mStart == mEnd && bias == (node.insertLeft ? "left" : "right"))
- { collapse = bias }
- if (bias == "left" && start == 0)
- { while (i && map[i - 2] == map[i - 3] && map[i - 1].insertLeft) {
- node = map[(i -= 3) + 2]
- collapse = "left"
- } }
- if (bias == "right" && start == mEnd - mStart)
- { while (i < map.length - 3 && map[i + 3] == map[i + 4] && !map[i + 5].insertLeft) {
- node = map[(i += 3) + 2]
- collapse = "right"
- } }
- break
- }
- }
- return {node: node, start: start, end: end, collapse: collapse, coverStart: mStart, coverEnd: mEnd}
-}
-
-function getUsefulRect(rects, bias) {
- var rect = nullRect
- if (bias == "left") { for (var i = 0; i < rects.length; i++) {
- if ((rect = rects[i]).left != rect.right) { break }
- } } else { for (var i$1 = rects.length - 1; i$1 >= 0; i$1--) {
- if ((rect = rects[i$1]).left != rect.right) { break }
- } }
- return rect
-}
-
-function measureCharInner(cm, prepared, ch, bias) {
- var place = nodeAndOffsetInLineMap(prepared.map, ch, bias)
- var node = place.node, start = place.start, end = place.end, collapse = place.collapse
-
- var rect
- if (node.nodeType == 3) { // If it is a text node, use a range to retrieve the coordinates.
- for (var i$1 = 0; i$1 < 4; i$1++) { // Retry a maximum of 4 times when nonsense rectangles are returned
- while (start && isExtendingChar(prepared.line.text.charAt(place.coverStart + start))) { --start }
- while (place.coverStart + end < place.coverEnd && isExtendingChar(prepared.line.text.charAt(place.coverStart + end))) { ++end }
- if (ie && ie_version < 9 && start == 0 && end == place.coverEnd - place.coverStart)
- { rect = node.parentNode.getBoundingClientRect() }
- else
- { rect = getUsefulRect(range(node, start, end).getClientRects(), bias) }
- if (rect.left || rect.right || start == 0) { break }
- end = start
- start = start - 1
- collapse = "right"
- }
- if (ie && ie_version < 11) { rect = maybeUpdateRectForZooming(cm.display.measure, rect) }
- } else { // If it is a widget, simply get the box for the whole widget.
- if (start > 0) { collapse = bias = "right" }
- var rects
- if (cm.options.lineWrapping && (rects = node.getClientRects()).length > 1)
- { rect = rects[bias == "right" ? rects.length - 1 : 0] }
- else
- { rect = node.getBoundingClientRect() }
- }
- if (ie && ie_version < 9 && !start && (!rect || !rect.left && !rect.right)) {
- var rSpan = node.parentNode.getClientRects()[0]
- if (rSpan)
- { rect = {left: rSpan.left, right: rSpan.left + charWidth(cm.display), top: rSpan.top, bottom: rSpan.bottom} }
- else
- { rect = nullRect }
- }
-
- var rtop = rect.top - prepared.rect.top, rbot = rect.bottom - prepared.rect.top
- var mid = (rtop + rbot) / 2
- var heights = prepared.view.measure.heights
- var i = 0
- for (; i < heights.length - 1; i++)
- { if (mid < heights[i]) { break } }
- var top = i ? heights[i - 1] : 0, bot = heights[i]
- var result = {left: (collapse == "right" ? rect.right : rect.left) - prepared.rect.left,
- right: (collapse == "left" ? rect.left : rect.right) - prepared.rect.left,
- top: top, bottom: bot}
- if (!rect.left && !rect.right) { result.bogus = true }
- if (!cm.options.singleCursorHeightPerLine) { result.rtop = rtop; result.rbottom = rbot }
-
- return result
-}
-
-// Work around problem with bounding client rects on ranges being
-// returned incorrectly when zoomed on IE10 and below.
-function maybeUpdateRectForZooming(measure, rect) {
- if (!window.screen || screen.logicalXDPI == null ||
- screen.logicalXDPI == screen.deviceXDPI || !hasBadZoomedRects(measure))
- { return rect }
- var scaleX = screen.logicalXDPI / screen.deviceXDPI
- var scaleY = screen.logicalYDPI / screen.deviceYDPI
- return {left: rect.left * scaleX, right: rect.right * scaleX,
- top: rect.top * scaleY, bottom: rect.bottom * scaleY}
-}
-
-function clearLineMeasurementCacheFor(lineView) {
- if (lineView.measure) {
- lineView.measure.cache = {}
- lineView.measure.heights = null
- if (lineView.rest) { for (var i = 0; i < lineView.rest.length; i++)
- { lineView.measure.caches[i] = {} } }
- }
-}
-
-function clearLineMeasurementCache(cm) {
- cm.display.externalMeasure = null
- removeChildren(cm.display.lineMeasure)
- for (var i = 0; i < cm.display.view.length; i++)
- { clearLineMeasurementCacheFor(cm.display.view[i]) }
-}
-
-function clearCaches(cm) {
- clearLineMeasurementCache(cm)
- cm.display.cachedCharWidth = cm.display.cachedTextHeight = cm.display.cachedPaddingH = null
- if (!cm.options.lineWrapping) { cm.display.maxLineChanged = true }
- cm.display.lineNumChars = null
-}
-
-function pageScrollX() { return window.pageXOffset || (document.documentElement || document.body).scrollLeft }
-function pageScrollY() { return window.pageYOffset || (document.documentElement || document.body).scrollTop }
-
-// Converts a {top, bottom, left, right} box from line-local
-// coordinates into another coordinate system. Context may be one of
-// "line", "div" (display.lineDiv), "local"./null (editor), "window",
-// or "page".
-function intoCoordSystem(cm, lineObj, rect, context, includeWidgets) {
- if (!includeWidgets && lineObj.widgets) { for (var i = 0; i < lineObj.widgets.length; ++i) { if (lineObj.widgets[i].above) {
- var size = widgetHeight(lineObj.widgets[i])
- rect.top += size; rect.bottom += size
- } } }
- if (context == "line") { return rect }
- if (!context) { context = "local" }
- var yOff = heightAtLine(lineObj)
- if (context == "local") { yOff += paddingTop(cm.display) }
- else { yOff -= cm.display.viewOffset }
- if (context == "page" || context == "window") {
- var lOff = cm.display.lineSpace.getBoundingClientRect()
- yOff += lOff.top + (context == "window" ? 0 : pageScrollY())
- var xOff = lOff.left + (context == "window" ? 0 : pageScrollX())
- rect.left += xOff; rect.right += xOff
- }
- rect.top += yOff; rect.bottom += yOff
- return rect
-}
-
-// Coverts a box from "div" coords to another coordinate system.
-// Context may be "window", "page", "div", or "local"./null.
-function fromCoordSystem(cm, coords, context) {
- if (context == "div") { return coords }
- var left = coords.left, top = coords.top
- // First move into "page" coordinate system
- if (context == "page") {
- left -= pageScrollX()
- top -= pageScrollY()
- } else if (context == "local" || !context) {
- var localBox = cm.display.sizer.getBoundingClientRect()
- left += localBox.left
- top += localBox.top
- }
-
- var lineSpaceBox = cm.display.lineSpace.getBoundingClientRect()
- return {left: left - lineSpaceBox.left, top: top - lineSpaceBox.top}
-}
-
-function charCoords(cm, pos, context, lineObj, bias) {
- if (!lineObj) { lineObj = getLine(cm.doc, pos.line) }
- return intoCoordSystem(cm, lineObj, measureChar(cm, lineObj, pos.ch, bias), context)
-}
-
-// Returns a box for a given cursor position, which may have an
-// 'other' property containing the position of the secondary cursor
-// on a bidi boundary.
-function cursorCoords(cm, pos, context, lineObj, preparedMeasure, varHeight) {
- lineObj = lineObj || getLine(cm.doc, pos.line)
- if (!preparedMeasure) { preparedMeasure = prepareMeasureForLine(cm, lineObj) }
- function get(ch, right) {
- var m = measureCharPrepared(cm, preparedMeasure, ch, right ? "right" : "left", varHeight)
- if (right) { m.left = m.right; } else { m.right = m.left }
- return intoCoordSystem(cm, lineObj, m, context)
- }
- function getBidi(ch, partPos) {
- var part = order[partPos], right = part.level % 2
- if (ch == bidiLeft(part) && partPos && part.level < order[partPos - 1].level) {
- part = order[--partPos]
- ch = bidiRight(part) - (part.level % 2 ? 0 : 1)
- right = true
- } else if (ch == bidiRight(part) && partPos < order.length - 1 && part.level < order[partPos + 1].level) {
- part = order[++partPos]
- ch = bidiLeft(part) - part.level % 2
- right = false
- }
- if (right && ch == part.to && ch > part.from) { return get(ch - 1) }
- return get(ch, right)
- }
- var order = getOrder(lineObj), ch = pos.ch
- if (!order) { return get(ch) }
- var partPos = getBidiPartAt(order, ch)
- var val = getBidi(ch, partPos)
- if (bidiOther != null) { val.other = getBidi(ch, bidiOther) }
- return val
-}
-
-// Used to cheaply estimate the coordinates for a position. Used for
-// intermediate scroll updates.
-function estimateCoords(cm, pos) {
- var left = 0
- pos = clipPos(cm.doc, pos)
- if (!cm.options.lineWrapping) { left = charWidth(cm.display) * pos.ch }
- var lineObj = getLine(cm.doc, pos.line)
- var top = heightAtLine(lineObj) + paddingTop(cm.display)
- return {left: left, right: left, top: top, bottom: top + lineObj.height}
-}
-
-// Positions returned by coordsChar contain some extra information.
-// xRel is the relative x position of the input coordinates compared
-// to the found position (so xRel > 0 means the coordinates are to
-// the right of the character position, for example). When outside
-// is true, that means the coordinates lie outside the line's
-// vertical range.
-function PosWithInfo(line, ch, outside, xRel) {
- var pos = Pos(line, ch)
- pos.xRel = xRel
- if (outside) { pos.outside = true }
- return pos
-}
-
-// Compute the character position closest to the given coordinates.
-// Input must be lineSpace-local ("div" coordinate system).
-function coordsChar(cm, x, y) {
- var doc = cm.doc
- y += cm.display.viewOffset
- if (y < 0) { return PosWithInfo(doc.first, 0, true, -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, true, 1) }
- if (x < 0) { x = 0 }
-
- var lineObj = getLine(doc, lineN)
- for (;;) {
- var found = coordsCharInner(cm, lineObj, lineN, x, y)
- var merged = collapsedSpanAtEnd(lineObj)
- var mergedPos = merged && merged.find(0, true)
- if (merged && (found.ch > mergedPos.from.ch || found.ch == mergedPos.from.ch && found.xRel > 0))
- { lineN = lineNo(lineObj = mergedPos.to.line) }
- else
- { return found }
- }
-}
-
-function coordsCharInner(cm, lineObj, lineNo, x, y) {
- var innerOff = y - heightAtLine(lineObj)
- var wrongLine = false, adjust = 2 * cm.display.wrapper.clientWidth
- var preparedMeasure = prepareMeasureForLine(cm, lineObj)
-
- function getX(ch) {
- var sp = cursorCoords(cm, Pos(lineNo, ch), "line", lineObj, preparedMeasure)
- wrongLine = true
- if (innerOff > sp.bottom) { return sp.left - adjust }
- else if (innerOff < sp.top) { return sp.left + adjust }
- else { wrongLine = false }
- return sp.left
- }
-
- var bidi = getOrder(lineObj), dist = lineObj.text.length
- var from = lineLeft(lineObj), to = lineRight(lineObj)
- var fromX = getX(from), fromOutside = wrongLine, toX = getX(to), toOutside = wrongLine
-
- if (x > toX) { return PosWithInfo(lineNo, to, toOutside, 1) }
- // Do a binary search between these bounds.
- for (;;) {
- if (bidi ? to == from || to == moveVisually(lineObj, from, 1) : to - from <= 1) {
- var ch = x < fromX || x - fromX <= toX - x ? from : to
- var outside = ch == from ? fromOutside : toOutside
- var xDiff = x - (ch == from ? fromX : toX)
- // This is a kludge to handle the case where the coordinates
- // are after a line-wrapped line. We should replace it with a
- // more general handling of cursor positions around line
- // breaks. (Issue #4078)
- if (toOutside && !bidi && !/\s/.test(lineObj.text.charAt(ch)) && xDiff > 0 &&
- ch < lineObj.text.length && preparedMeasure.view.measure.heights.length > 1) {
- var charSize = measureCharPrepared(cm, preparedMeasure, ch, "right")
- if (innerOff <= charSize.bottom && innerOff >= charSize.top && Math.abs(x - charSize.right) < xDiff) {
- outside = false
- ch++
- xDiff = x - charSize.right
- }
- }
- while (isExtendingChar(lineObj.text.charAt(ch))) { ++ch }
- var pos = PosWithInfo(lineNo, ch, outside, xDiff < -1 ? -1 : xDiff > 1 ? 1 : 0)
- return pos
- }
- var step = Math.ceil(dist / 2), middle = from + step
- if (bidi) {
- middle = from
- for (var i = 0; i < step; ++i) { middle = moveVisually(lineObj, middle, 1) }
- }
- var middleX = getX(middle)
- if (middleX > x) {to = middle; toX = middleX; if (toOutside = wrongLine) { toX += 1000; } dist = step}
- else {from = middle; fromX = middleX; fromOutside = wrongLine; dist -= step}
- }
-}
-
-var measureText
-// Compute the default text height.
-function textHeight(display) {
- if (display.cachedTextHeight != null) { return display.cachedTextHeight }
- if (measureText == null) {
- measureText = elt("pre")
- // Measure a bunch of lines, for browsers that compute
- // fractional heights.
- for (var i = 0; i < 49; ++i) {
- measureText.appendChild(document.createTextNode("x"))
- measureText.appendChild(elt("br"))
- }
- measureText.appendChild(document.createTextNode("x"))
- }
- removeChildrenAndAdd(display.measure, measureText)
- var height = measureText.offsetHeight / 50
- if (height > 3) { display.cachedTextHeight = height }
- removeChildren(display.measure)
- return height || 1
-}
-
-// Compute the default character width.
-function charWidth(display) {
- if (display.cachedCharWidth != null) { return display.cachedCharWidth }
- var anchor = elt("span", "xxxxxxxxxx")
- var pre = elt("pre", [anchor])
- removeChildrenAndAdd(display.measure, pre)
- var rect = anchor.getBoundingClientRect(), width = (rect.right - rect.left) / 10
- if (width > 2) { display.cachedCharWidth = width }
- return width || 10
-}
-
-// Do a bulk-read of the DOM positions and sizes needed to draw the
-// view, so that we don't interleave reading and writing to the DOM.
-function getDimensions(cm) {
- var d = cm.display, left = {}, width = {}
- var gutterLeft = d.gutters.clientLeft
- for (var n = d.gutters.firstChild, i = 0; n; n = n.nextSibling, ++i) {
- left[cm.options.gutters[i]] = n.offsetLeft + n.clientLeft + gutterLeft
- width[cm.options.gutters[i]] = n.clientWidth
- }
- return {fixedPos: compensateForHScroll(d),
- gutterTotalWidth: d.gutters.offsetWidth,
- gutterLeft: left,
- gutterWidth: width,
- wrapperWidth: d.wrapper.clientWidth}
-}
-
-// Computes display.scroller.scrollLeft + display.gutters.offsetWidth,
-// but using getBoundingClientRect to get a sub-pixel-accurate
-// result.
-function compensateForHScroll(display) {
- return display.scroller.getBoundingClientRect().left - display.sizer.getBoundingClientRect().left
-}
-
-// Returns a function that estimates the height of a line, to use as
-// first approximation until the line becomes visible (and is thus
-// properly measurable).
-function estimateHeight(cm) {
- var th = textHeight(cm.display), wrapping = cm.options.lineWrapping
- var perLine = wrapping && Math.max(5, cm.display.scroller.clientWidth / charWidth(cm.display) - 3)
- return function (line) {
- if (lineIsHidden(cm.doc, line)) { return 0 }
-
- var widgetsHeight = 0
- if (line.widgets) { for (var i = 0; i < line.widgets.length; i++) {
- if (line.widgets[i].height) { widgetsHeight += line.widgets[i].height }
- } }
-
- if (wrapping)
- { return widgetsHeight + (Math.ceil(line.text.length / perLine) || 1) * th }
- else
- { return widgetsHeight + th }
- }
-}
-
-function estimateLineHeights(cm) {
- var doc = cm.doc, est = estimateHeight(cm)
- doc.iter(function (line) {
- var estHeight = est(line)
- if (estHeight != line.height) { updateLineHeight(line, estHeight) }
- })
-}
-
-// Given a mouse event, find the corresponding position. If liberal
-// is false, it checks whether a gutter or scrollbar was clicked,
-// and returns null if it was. forRect is used by rectangular
-// selections, and tries to estimate a character position even for
-// coordinates beyond the right of the text.
-function posFromMouse(cm, e, liberal, forRect) {
- var display = cm.display
- if (!liberal && e_target(e).getAttribute("cm-not-content") == "true") { return null }
-
- var x, y, space = display.lineSpace.getBoundingClientRect()
- // Fails unpredictably on IE[67] when mouse is dragged around quickly.
- 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) {
- 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))
- }
- return coords
-}
-
-// Find the view element corresponding to a given line. Return null
-// when the line isn't visible.
-function findViewIndex(cm, n) {
- if (n >= cm.display.viewTo) { return null }
- n -= cm.display.viewFrom
- if (n < 0) { return null }
- var view = cm.display.view
- for (var i = 0; i < view.length; i++) {
- n -= view[i].size
- if (n < 0) { return i }
- }
-}
-
-function updateSelection(cm) {
- cm.display.input.showSelection(cm.display.input.prepareSelection())
-}
-
-function prepareSelection(cm, primary) {
- var doc = cm.doc, result = {}
- var curFragment = result.cursors = document.createDocumentFragment()
- var selFragment = result.selection = document.createDocumentFragment()
-
- for (var i = 0; i < doc.sel.ranges.length; i++) {
- if (primary === false && i == doc.sel.primIndex) { continue }
- var range = doc.sel.ranges[i]
- if (range.from().line >= cm.display.viewTo || range.to().line < cm.display.viewFrom) { continue }
- var collapsed = range.empty()
- if (collapsed || cm.options.showCursorWhenSelecting)
- { drawSelectionCursor(cm, range.head, curFragment) }
- if (!collapsed)
- { drawSelectionRange(cm, range, selFragment) }
- }
- return result
-}
-
-// Draws a cursor for the given range
-function drawSelectionCursor(cm, head, output) {
- var pos = cursorCoords(cm, head, "div", null, null, !cm.options.singleCursorHeightPerLine)
-
- var cursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor"))
- cursor.style.left = pos.left + "px"
- cursor.style.top = pos.top + "px"
- cursor.style.height = Math.max(0, pos.bottom - pos.top) * cm.options.cursorHeight + "px"
-
- if (pos.other) {
- // Secondary cursor, shown when on a 'jump' in bi-directional text
- var otherCursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor CodeMirror-secondarycursor"))
- otherCursor.style.display = ""
- otherCursor.style.left = pos.other.left + "px"
- otherCursor.style.top = pos.other.top + "px"
- otherCursor.style.height = (pos.other.bottom - pos.other.top) * .85 + "px"
- }
-}
-
-// Draws the given range as a highlighted selection
-function drawSelectionRange(cm, range, output) {
- var display = cm.display, doc = cm.doc
- var fragment = document.createDocumentFragment()
- var padding = paddingH(cm.display), leftSide = padding.left
- var rightSide = Math.max(display.sizerWidth, displayWidth(cm) - display.sizer.offsetLeft) - padding.right
-
- function add(left, top, width, bottom) {
- if (top < 0) { top = 0 }
- top = Math.round(top)
- bottom = Math.round(bottom)
- fragment.appendChild(elt("div", null, "CodeMirror-selected", ("position: absolute; left: " + left + "px;\n top: " + top + "px; width: " + (width == null ? rightSide - left : width) + "px;\n height: " + (bottom - top) + "px")))
- }
-
- function drawForLine(line, fromArg, toArg) {
- var lineObj = getLine(doc, line)
- var lineLen = lineObj.text.length
- var start, end
- function coords(ch, bias) {
- return charCoords(cm, Pos(line, ch), "div", lineObj, bias)
- }
-
- iterateBidiSections(getOrder(lineObj), fromArg || 0, toArg == null ? lineLen : toArg, function (from, to, dir) {
- var leftPos = coords(from, "left"), rightPos, left, right
- if (from == to) {
- rightPos = leftPos
- left = right = leftPos.left
- } else {
- rightPos = coords(to - 1, "right")
- if (dir == "rtl") { var tmp = leftPos; leftPos = rightPos; rightPos = tmp }
- left = leftPos.left
- right = rightPos.right
- }
- if (fromArg == null && from == 0) { left = leftSide }
- if (rightPos.top - leftPos.top > 3) { // Different lines, draw top part
- add(left, leftPos.top, null, leftPos.bottom)
- left = leftSide
- if (leftPos.bottom < rightPos.top) { add(left, leftPos.bottom, null, rightPos.top) }
- }
- if (toArg == null && to == lineLen) { right = rightSide }
- if (!start || leftPos.top < start.top || leftPos.top == start.top && leftPos.left < start.left)
- { start = leftPos }
- if (!end || rightPos.bottom > end.bottom || rightPos.bottom == end.bottom && rightPos.right > end.right)
- { end = rightPos }
- if (left < leftSide + 1) { left = leftSide }
- add(left, rightPos.top, right - left, rightPos.bottom)
- })
- return {start: start, end: end}
- }
-
- var sFrom = range.from(), sTo = range.to()
- if (sFrom.line == sTo.line) {
- drawForLine(sFrom.line, sFrom.ch, sTo.ch)
- } else {
- var fromLine = getLine(doc, sFrom.line), toLine = getLine(doc, sTo.line)
- var singleVLine = visualLine(fromLine) == visualLine(toLine)
- var leftEnd = drawForLine(sFrom.line, sFrom.ch, singleVLine ? fromLine.text.length + 1 : null).end
- var rightStart = drawForLine(sTo.line, singleVLine ? 0 : null, sTo.ch).start
- if (singleVLine) {
- if (leftEnd.top < rightStart.top - 2) {
- add(leftEnd.right, leftEnd.top, null, leftEnd.bottom)
- add(leftSide, rightStart.top, rightStart.left, rightStart.bottom)
- } else {
- add(leftEnd.right, leftEnd.top, rightStart.left - leftEnd.right, leftEnd.bottom)
- }
- }
- if (leftEnd.bottom < rightStart.top)
- { add(leftSide, leftEnd.bottom, null, rightStart.top) }
- }
-
- output.appendChild(fragment)
-}
-
-// Cursor-blinking
-function restartBlink(cm) {
- if (!cm.state.focused) { return }
- var display = cm.display
- clearInterval(display.blinker)
- var on = true
- display.cursorDiv.style.visibility = ""
- if (cm.options.cursorBlinkRate > 0)
- { display.blinker = setInterval(function () { return display.cursorDiv.style.visibility = (on = !on) ? "" : "hidden"; },
- cm.options.cursorBlinkRate) }
- else if (cm.options.cursorBlinkRate < 0)
- { display.cursorDiv.style.visibility = "hidden" }
-}
-
-function ensureFocus(cm) {
- if (!cm.state.focused) { cm.display.input.focus(); onFocus(cm) }
-}
-
-function delayBlurEvent(cm) {
- cm.state.delayingBlurEvent = true
- setTimeout(function () { if (cm.state.delayingBlurEvent) {
- cm.state.delayingBlurEvent = false
- onBlur(cm)
- } }, 100)
-}
-
-function onFocus(cm, e) {
- if (cm.state.delayingBlurEvent) { cm.state.delayingBlurEvent = false }
-
- if (cm.options.readOnly == "nocursor") { return }
- if (!cm.state.focused) {
- signal(cm, "focus", cm, e)
- cm.state.focused = true
- addClass(cm.display.wrapper, "CodeMirror-focused")
- // This test prevents this from firing when a context
- // menu is closed (since the input reset would kill the
- // select-all detection hack)
- if (!cm.curOp && cm.display.selForContextMenu != cm.doc.sel) {
- cm.display.input.reset()
- if (webkit) { setTimeout(function () { return cm.display.input.reset(true); }, 20) } // Issue #1730
- }
- cm.display.input.receivedFocus()
- }
- restartBlink(cm)
-}
-function onBlur(cm, e) {
- if (cm.state.delayingBlurEvent) { return }
-
- if (cm.state.focused) {
- signal(cm, "blur", cm, e)
- cm.state.focused = false
- rmClass(cm.display.wrapper, "CodeMirror-focused")
- }
- clearInterval(cm.display.blinker)
- setTimeout(function () { if (!cm.state.focused) { cm.display.shift = false } }, 150)
-}
-
-// Re-align line numbers and gutter marks to compensate for
-// horizontal scrolling.
-function alignHorizontally(cm) {
- var display = cm.display, view = display.view
- if (!display.alignWidgets && (!display.gutters.firstChild || !cm.options.fixedGutter)) { return }
- var comp = compensateForHScroll(display) - display.scroller.scrollLeft + cm.doc.scrollLeft
- var gutterW = display.gutters.offsetWidth, left = comp + "px"
- for (var i = 0; i < view.length; i++) { if (!view[i].hidden) {
- if (cm.options.fixedGutter) {
- if (view[i].gutter)
- { view[i].gutter.style.left = left }
- if (view[i].gutterBackground)
- { view[i].gutterBackground.style.left = left }
- }
- var align = view[i].alignable
- if (align) { for (var j = 0; j < align.length; j++)
- { align[j].style.left = left } }
- } }
- if (cm.options.fixedGutter)
- { display.gutters.style.left = (comp + gutterW) + "px" }
-}
-
-// Used to ensure that the line number gutter is still the right
-// size for the current document size. Returns true when an update
-// is needed.
-function maybeUpdateLineNumberWidth(cm) {
- if (!cm.options.lineNumbers) { return false }
- var doc = cm.doc, last = lineNumberFor(cm.options, doc.first + doc.size - 1), display = cm.display
- if (last.length != display.lineNumChars) {
- var test = display.measure.appendChild(elt("div", [elt("div", last)],
- "CodeMirror-linenumber CodeMirror-gutter-elt"))
- var innerW = test.firstChild.offsetWidth, padding = test.offsetWidth - innerW
- display.lineGutter.style.width = ""
- display.lineNumInnerWidth = Math.max(innerW, display.lineGutter.offsetWidth - padding) + 1
- display.lineNumWidth = display.lineNumInnerWidth + padding
- display.lineNumChars = display.lineNumInnerWidth ? last.length : -1
- display.lineGutter.style.width = display.lineNumWidth + "px"
- updateGutterSpace(cm)
- return true
- }
- return false
-}
-
-// Read the actual heights of the rendered lines, and update their
-// stored heights to match.
-function updateHeightsInViewport(cm) {
- var display = cm.display
- var prevBottom = display.lineDiv.offsetTop
- for (var i = 0; i < display.view.length; i++) {
- var cur = display.view[i], height = (void 0)
- if (cur.hidden) { continue }
- if (ie && ie_version < 8) {
- var bot = cur.node.offsetTop + cur.node.offsetHeight
- height = bot - prevBottom
- prevBottom = bot
- } else {
- var box = cur.node.getBoundingClientRect()
- height = box.bottom - box.top
- }
- var diff = cur.line.height - height
- if (height < 2) { height = textHeight(display) }
- if (diff > .001 || diff < -.001) {
- updateLineHeight(cur.line, height)
- updateWidgetHeight(cur.line)
- if (cur.rest) { for (var j = 0; j < cur.rest.length; j++)
- { updateWidgetHeight(cur.rest[j]) } }
- }
- }
-}
-
-// Read and store the height of line widgets associated with the
-// given line.
-function updateWidgetHeight(line) {
- if (line.widgets) { for (var i = 0; i < line.widgets.length; ++i)
- { line.widgets[i].height = line.widgets[i].node.parentNode.offsetHeight } }
-}
-
-// Compute the lines that are visible in a given viewport (defaults
-// the the current scroll position). viewport may contain top,
-// height, and ensure (see op.scrollToPos) properties.
-function visibleLines(display, doc, viewport) {
- var top = viewport && viewport.top != null ? Math.max(0, viewport.top) : display.scroller.scrollTop
- top = Math.floor(top - paddingTop(display))
- var bottom = viewport && viewport.bottom != null ? viewport.bottom : top + display.wrapper.clientHeight
-
- var from = lineAtHeight(doc, top), to = lineAtHeight(doc, bottom)
- // Ensure is a {from: {line, ch}, to: {line, ch}} object, and
- // forces those lines into the viewport (if possible).
- if (viewport && viewport.ensure) {
- var ensureFrom = viewport.ensure.from.line, ensureTo = viewport.ensure.to.line
- if (ensureFrom < from) {
- from = ensureFrom
- to = lineAtHeight(doc, heightAtLine(getLine(doc, ensureFrom)) + display.wrapper.clientHeight)
- } else if (Math.min(ensureTo, doc.lastLine()) >= to) {
- from = lineAtHeight(doc, heightAtLine(getLine(doc, ensureTo)) - display.wrapper.clientHeight)
- to = ensureTo
- }
- }
- return {from: from, to: Math.max(to, from + 1)}
-}
-
-// Sync the scrollable area and scrollbars, ensure the viewport
-// covers the visible area.
-function setScrollTop(cm, val) {
- if (Math.abs(cm.doc.scrollTop - val) < 2) { return }
- cm.doc.scrollTop = val
- if (!gecko) { updateDisplaySimple(cm, {top: val}) }
- if (cm.display.scroller.scrollTop != val) { cm.display.scroller.scrollTop = val }
- cm.display.scrollbars.setScrollTop(val)
- if (gecko) { updateDisplaySimple(cm) }
- startWorker(cm, 100)
-}
-// Sync scroller and scrollbar, ensure the gutter elements are
-// aligned.
-function setScrollLeft(cm, val, isScroller) {
- if (isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) { return }
- val = Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth)
- cm.doc.scrollLeft = val
- alignHorizontally(cm)
- if (cm.display.scroller.scrollLeft != val) { cm.display.scroller.scrollLeft = val }
- cm.display.scrollbars.setScrollLeft(val)
-}
-
-// Since the delta values reported on mouse wheel events are
-// unstandardized between browsers and even browser versions, and
-// generally horribly unpredictable, this code starts by measuring
-// the scroll effect that the first few mouse wheel events have,
-// and, from that, detects the way it can convert deltas to pixel
-// offsets afterwards.
-//
-// The reason we want to know the amount a wheel event will scroll
-// is that it gives us a chance to update the display before the
-// actual scrolling happens, reducing flickering.
-
-var wheelSamples = 0;
-var wheelPixelsPerUnit = null;
-// Fill in a browser-detected starting value on browsers where we
-// know one. These don't have to be accurate -- the result of them
-// being wrong would just be a slight flicker on the first wheel
-// scroll (if it is large enough).
-if (ie) { wheelPixelsPerUnit = -.53 }
-else if (gecko) { wheelPixelsPerUnit = 15 }
-else if (chrome) { wheelPixelsPerUnit = -.7 }
-else if (safari) { wheelPixelsPerUnit = -1/3 }
-
-function wheelEventDelta(e) {
- var dx = e.wheelDeltaX, dy = e.wheelDeltaY
- if (dx == null && e.detail && e.axis == e.HORIZONTAL_AXIS) { dx = e.detail }
- if (dy == null && e.detail && e.axis == e.VERTICAL_AXIS) { dy = e.detail }
- else if (dy == null) { dy = e.wheelDelta }
- return {x: dx, y: dy}
-}
-function wheelEventPixels(e) {
- var delta = wheelEventDelta(e)
- delta.x *= wheelPixelsPerUnit
- delta.y *= wheelPixelsPerUnit
- return delta
-}
-
-function onScrollWheel(cm, e) {
- var delta = wheelEventDelta(e), dx = delta.x, dy = delta.y
-
- var display = cm.display, scroll = display.scroller
- // Quit if there's nothing to scroll here
- var canScrollX = scroll.scrollWidth > scroll.clientWidth
- var canScrollY = scroll.scrollHeight > scroll.clientHeight
- if (!(dx && canScrollX || dy && canScrollY)) { return }
-
- // Webkit browsers on OS X abort momentum scrolls when the target
- // of the scroll event is removed from the scrollable element.
- // This hack (see related code in patchDisplay) makes sure the
- // element is kept around.
- if (dy && mac && webkit) {
- outer: for (var cur = e.target, view = display.view; cur != scroll; cur = cur.parentNode) {
- for (var i = 0; i < view.length; i++) {
- if (view[i].node == cur) {
- cm.display.currentWheelTarget = cur
- break outer
- }
- }
- }
- }
-
- // On some browsers, horizontal scrolling will cause redraws to
- // happen before the gutter has been realigned, causing it to
- // wriggle around in a most unseemly way. When we have an
- // estimated pixels/delta value, we just handle horizontal
- // scrolling entirely here. It'll be slightly off from native, but
- // better than glitching out.
- if (dx && !gecko && !presto && wheelPixelsPerUnit != null) {
- if (dy && canScrollY)
- { setScrollTop(cm, Math.max(0, Math.min(scroll.scrollTop + dy * wheelPixelsPerUnit, scroll.scrollHeight - scroll.clientHeight))) }
- setScrollLeft(cm, Math.max(0, Math.min(scroll.scrollLeft + dx * wheelPixelsPerUnit, scroll.scrollWidth - scroll.clientWidth)))
- // Only prevent default scrolling if vertical scrolling is
- // actually possible. Otherwise, it causes vertical scroll
- // jitter on OSX trackpads when deltaX is small and deltaY
- // is large (issue #3579)
- if (!dy || (dy && canScrollY))
- { e_preventDefault(e) }
- display.wheelStartX = null // Abort measurement, if in progress
- return
- }
-
- // 'Project' the visible viewport to cover the area that is being
- // scrolled into view (if we know enough to estimate it).
- if (dy && wheelPixelsPerUnit != null) {
- var pixels = dy * wheelPixelsPerUnit
- var top = cm.doc.scrollTop, bot = top + display.wrapper.clientHeight
- if (pixels < 0) { top = Math.max(0, top + pixels - 50) }
- else { bot = Math.min(cm.doc.height, bot + pixels + 50) }
- updateDisplaySimple(cm, {top: top, bottom: bot})
- }
-
- if (wheelSamples < 20) {
- if (display.wheelStartX == null) {
- display.wheelStartX = scroll.scrollLeft; display.wheelStartY = scroll.scrollTop
- display.wheelDX = dx; display.wheelDY = dy
- setTimeout(function () {
- if (display.wheelStartX == null) { return }
- var movedX = scroll.scrollLeft - display.wheelStartX
- var movedY = scroll.scrollTop - display.wheelStartY
- var sample = (movedY && display.wheelDY && movedY / display.wheelDY) ||
- (movedX && display.wheelDX && movedX / display.wheelDX)
- display.wheelStartX = display.wheelStartY = null
- if (!sample) { return }
- wheelPixelsPerUnit = (wheelPixelsPerUnit * wheelSamples + sample) / (wheelSamples + 1)
- ++wheelSamples
- }, 200)
- } else {
- display.wheelDX += dx; display.wheelDY += dy
- }
- }
-}
-
-// SCROLLBARS
-
-// Prepare DOM reads needed to update the scrollbars. Done in one
-// shot to minimize update/measure roundtrips.
-function measureForScrollbars(cm) {
- var d = cm.display, gutterW = d.gutters.offsetWidth
- var docH = Math.round(cm.doc.height + paddingVert(cm.display))
- return {
- clientHeight: d.scroller.clientHeight,
- viewHeight: d.wrapper.clientHeight,
- scrollWidth: d.scroller.scrollWidth, clientWidth: d.scroller.clientWidth,
- viewWidth: d.wrapper.clientWidth,
- barLeft: cm.options.fixedGutter ? gutterW : 0,
- docHeight: docH,
- scrollHeight: docH + scrollGap(cm) + d.barHeight,
- nativeBarWidth: d.nativeBarWidth,
- gutterWidth: gutterW
- }
-}
-
-var NativeScrollbars = function(place, scroll, cm) {
- this.cm = cm
- var vert = this.vert = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar")
- var horiz = this.horiz = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar")
- place(vert); place(horiz)
-
- on(vert, "scroll", function () {
- if (vert.clientHeight) { scroll(vert.scrollTop, "vertical") }
- })
- on(horiz, "scroll", function () {
- if (horiz.clientWidth) { scroll(horiz.scrollLeft, "horizontal") }
- })
-
- this.checkedZeroWidth = false
- // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
- if (ie && ie_version < 8) { this.horiz.style.minHeight = this.vert.style.minWidth = "18px" }
-};
-
-NativeScrollbars.prototype.update = function (measure) {
- var needsH = measure.scrollWidth > measure.clientWidth + 1
- var needsV = measure.scrollHeight > measure.clientHeight + 1
- var sWidth = measure.nativeBarWidth
-
- if (needsV) {
- this.vert.style.display = "block"
- this.vert.style.bottom = needsH ? sWidth + "px" : "0"
- var totalHeight = measure.viewHeight - (needsH ? sWidth : 0)
- // A bug in IE8 can cause this value to be negative, so guard it.
- this.vert.firstChild.style.height =
- Math.max(0, measure.scrollHeight - measure.clientHeight + totalHeight) + "px"
- } else {
- this.vert.style.display = ""
- this.vert.firstChild.style.height = "0"
- }
-
- if (needsH) {
- this.horiz.style.display = "block"
- this.horiz.style.right = needsV ? sWidth + "px" : "0"
- this.horiz.style.left = measure.barLeft + "px"
- var totalWidth = measure.viewWidth - measure.barLeft - (needsV ? sWidth : 0)
- this.horiz.firstChild.style.width =
- (measure.scrollWidth - measure.clientWidth + totalWidth) + "px"
- } else {
- this.horiz.style.display = ""
- this.horiz.firstChild.style.width = "0"
- }
-
- if (!this.checkedZeroWidth && measure.clientHeight > 0) {
- if (sWidth == 0) { this.zeroWidthHack() }
- this.checkedZeroWidth = true
- }
-
- return {right: needsV ? sWidth : 0, bottom: needsH ? sWidth : 0}
-};
-
-NativeScrollbars.prototype.setScrollLeft = function (pos) {
- if (this.horiz.scrollLeft != pos) { this.horiz.scrollLeft = pos }
- if (this.disableHoriz) { this.enableZeroWidthBar(this.horiz, this.disableHoriz) }
-};
-
-NativeScrollbars.prototype.setScrollTop = function (pos) {
- if (this.vert.scrollTop != pos) { this.vert.scrollTop = pos }
- if (this.disableVert) { this.enableZeroWidthBar(this.vert, this.disableVert) }
-};
-
-NativeScrollbars.prototype.zeroWidthHack = function () {
- var w = mac && !mac_geMountainLion ? "12px" : "18px"
- this.horiz.style.height = this.vert.style.width = w
- this.horiz.style.pointerEvents = this.vert.style.pointerEvents = "none"
- this.disableHoriz = new Delayed
- this.disableVert = new Delayed
-};
-
-NativeScrollbars.prototype.enableZeroWidthBar = function (bar, delay) {
- bar.style.pointerEvents = "auto"
- function maybeDisable() {
- // To find out whether the scrollbar is still visible, we
- // check whether the element under the pixel in the bottom
- // left corner of the scrollbar box is the scrollbar box
- // itself (when the bar is still visible) or its filler child
- // (when the bar is hidden). If it is still visible, we keep
- // it enabled, if it's hidden, we disable pointer events.
- var box = bar.getBoundingClientRect()
- var elt = document.elementFromPoint(box.left + 1, box.bottom - 1)
- if (elt != bar) { bar.style.pointerEvents = "none" }
- else { delay.set(1000, maybeDisable) }
- }
- delay.set(1000, maybeDisable)
-};
-
-NativeScrollbars.prototype.clear = function () {
- var parent = this.horiz.parentNode
- parent.removeChild(this.horiz)
- parent.removeChild(this.vert)
-};
-
-var NullScrollbars = function () {};
-
-NullScrollbars.prototype.update = function () { return {bottom: 0, right: 0} };
-NullScrollbars.prototype.setScrollLeft = function () {};
-NullScrollbars.prototype.setScrollTop = function () {};
-NullScrollbars.prototype.clear = function () {};
-
-function updateScrollbars(cm, measure) {
- if (!measure) { measure = measureForScrollbars(cm) }
- var startWidth = cm.display.barWidth, startHeight = cm.display.barHeight
- updateScrollbarsInner(cm, measure)
- for (var i = 0; i < 4 && startWidth != cm.display.barWidth || startHeight != cm.display.barHeight; i++) {
- if (startWidth != cm.display.barWidth && cm.options.lineWrapping)
- { updateHeightsInViewport(cm) }
- updateScrollbarsInner(cm, measureForScrollbars(cm))
- startWidth = cm.display.barWidth; startHeight = cm.display.barHeight
- }
-}
-
-// Re-synchronize the fake scrollbars with the actual size of the
-// content.
-function updateScrollbarsInner(cm, measure) {
- var d = cm.display
- var sizes = d.scrollbars.update(measure)
-
- d.sizer.style.paddingRight = (d.barWidth = sizes.right) + "px"
- d.sizer.style.paddingBottom = (d.barHeight = sizes.bottom) + "px"
- d.heightForcer.style.borderBottom = sizes.bottom + "px solid transparent"
-
- if (sizes.right && sizes.bottom) {
- d.scrollbarFiller.style.display = "block"
- d.scrollbarFiller.style.height = sizes.bottom + "px"
- d.scrollbarFiller.style.width = sizes.right + "px"
- } else { d.scrollbarFiller.style.display = "" }
- if (sizes.bottom && cm.options.coverGutterNextToScrollbar && cm.options.fixedGutter) {
- d.gutterFiller.style.display = "block"
- d.gutterFiller.style.height = sizes.bottom + "px"
- d.gutterFiller.style.width = measure.gutterWidth + "px"
- } else { d.gutterFiller.style.display = "" }
-}
-
-var scrollbarModel = {"native": NativeScrollbars, "null": NullScrollbars}
-
-function initScrollbars(cm) {
- if (cm.display.scrollbars) {
- cm.display.scrollbars.clear()
- if (cm.display.scrollbars.addClass)
- { rmClass(cm.display.wrapper, cm.display.scrollbars.addClass) }
- }
-
- cm.display.scrollbars = new scrollbarModel[cm.options.scrollbarStyle](function (node) {
- cm.display.wrapper.insertBefore(node, cm.display.scrollbarFiller)
- // Prevent clicks in the scrollbars from killing focus
- on(node, "mousedown", function () {
- if (cm.state.focused) { setTimeout(function () { return cm.display.input.focus(); }, 0) }
- })
- node.setAttribute("cm-not-content", "true")
- }, function (pos, axis) {
- if (axis == "horizontal") { setScrollLeft(cm, pos) }
- else { setScrollTop(cm, pos) }
- }, cm)
- if (cm.display.scrollbars.addClass)
- { addClass(cm.display.wrapper, cm.display.scrollbars.addClass) }
-}
-
-// SCROLLING THINGS INTO VIEW
-
-// If an editor sits on the top or bottom of the window, partially
-// scrolled out of view, this ensures that the cursor is visible.
-function maybeScrollWindow(cm, coords) {
- if (signalDOMEvent(cm, "scrollCursorIntoView")) { return }
-
- var display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null
- if (coords.top + box.top < 0) { doScroll = true }
- else if (coords.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) { doScroll = false }
- if (doScroll != null && !phantom) {
- var scrollNode = elt("div", "\u200b", null, ("position: absolute;\n top: " + (coords.top - display.viewOffset - paddingTop(cm.display)) + "px;\n height: " + (coords.bottom - coords.top + scrollGap(cm) + display.barHeight) + "px;\n left: " + (coords.left) + "px; width: 2px;"))
- cm.display.lineSpace.appendChild(scrollNode)
- scrollNode.scrollIntoView(doScroll)
- cm.display.lineSpace.removeChild(scrollNode)
- }
-}
-
-// Scroll a given position into view (immediately), verifying that
-// it actually became visible (as line heights are accurately
-// measured, the position of something may 'drift' during drawing).
-function scrollPosIntoView(cm, pos, end, margin) {
- if (margin == null) { margin = 0 }
- var coords
- for (var limit = 0; limit < 5; limit++) {
- var changed = false
- coords = cursorCoords(cm, pos)
- var endCoords = !end || end == pos ? coords : cursorCoords(cm, end)
- var scrollPos = calculateScrollPos(cm, Math.min(coords.left, endCoords.left),
- Math.min(coords.top, endCoords.top) - margin,
- Math.max(coords.left, endCoords.left),
- Math.max(coords.bottom, endCoords.bottom) + margin)
- var startTop = cm.doc.scrollTop, startLeft = cm.doc.scrollLeft
- if (scrollPos.scrollTop != null) {
- setScrollTop(cm, scrollPos.scrollTop)
- if (Math.abs(cm.doc.scrollTop - startTop) > 1) { changed = true }
- }
- if (scrollPos.scrollLeft != null) {
- setScrollLeft(cm, scrollPos.scrollLeft)
- if (Math.abs(cm.doc.scrollLeft - startLeft) > 1) { changed = true }
- }
- if (!changed) { break }
- }
- return coords
-}
-
-// Scroll a given set of coordinates into view (immediately).
-function scrollIntoView(cm, x1, y1, x2, y2) {
- var scrollPos = calculateScrollPos(cm, x1, y1, x2, y2)
- if (scrollPos.scrollTop != null) { setScrollTop(cm, scrollPos.scrollTop) }
- if (scrollPos.scrollLeft != null) { setScrollLeft(cm, scrollPos.scrollLeft) }
-}
-
-// Calculate a new scroll position needed to scroll the given
-// rectangle into view. Returns an object with scrollTop and
-// scrollLeft properties. When these are undefined, the
-// vertical/horizontal position does not need to be adjusted.
-function calculateScrollPos(cm, x1, y1, x2, y2) {
- var display = cm.display, snapMargin = textHeight(cm.display)
- if (y1 < 0) { y1 = 0 }
- var screentop = cm.curOp && cm.curOp.scrollTop != null ? cm.curOp.scrollTop : display.scroller.scrollTop
- var screen = displayHeight(cm), result = {}
- if (y2 - y1 > screen) { y2 = y1 + screen }
- var docBottom = cm.doc.height + paddingVert(display)
- var atTop = y1 < snapMargin, atBottom = y2 > docBottom - snapMargin
- if (y1 < screentop) {
- result.scrollTop = atTop ? 0 : y1
- } else if (y2 > screentop + screen) {
- var newTop = Math.min(y1, (atBottom ? docBottom : y2) - screen)
- if (newTop != screentop) { result.scrollTop = newTop }
- }
-
- var screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft
- var screenw = displayWidth(cm) - (cm.options.fixedGutter ? display.gutters.offsetWidth : 0)
- var tooWide = x2 - x1 > screenw
- if (tooWide) { x2 = x1 + screenw }
- if (x1 < 10)
- { result.scrollLeft = 0 }
- else if (x1 < screenleft)
- { result.scrollLeft = Math.max(0, x1 - (tooWide ? 0 : 10)) }
- else if (x2 > screenw + screenleft - 3)
- { result.scrollLeft = x2 + (tooWide ? 0 : 10) - screenw }
- return result
-}
-
-// Store a relative adjustment to the scroll position in the current
-// operation (to be applied when the operation finishes).
-function addToScrollPos(cm, left, top) {
- if (left != null || top != null) { resolveScrollToPos(cm) }
- if (left != null)
- { cm.curOp.scrollLeft = (cm.curOp.scrollLeft == null ? cm.doc.scrollLeft : cm.curOp.scrollLeft) + left }
- if (top != null)
- { cm.curOp.scrollTop = (cm.curOp.scrollTop == null ? cm.doc.scrollTop : cm.curOp.scrollTop) + top }
-}
-
-// Make sure that at the end of the operation the current cursor is
-// shown.
-function ensureCursorVisible(cm) {
- resolveScrollToPos(cm)
- var cur = cm.getCursor(), from = cur, to = cur
- if (!cm.options.lineWrapping) {
- from = cur.ch ? Pos(cur.line, cur.ch - 1) : cur
- to = Pos(cur.line, cur.ch + 1)
- }
- cm.curOp.scrollToPos = {from: from, to: to, margin: cm.options.cursorScrollMargin, isCursor: true}
-}
-
-// When an operation has its scrollToPos property set, and another
-// scroll action is applied before the end of the operation, this
-// 'simulates' scrolling that position into view in a cheap way, so
-// that the effect of intermediate scroll commands is not ignored.
-function resolveScrollToPos(cm) {
- var range = cm.curOp.scrollToPos
- if (range) {
- cm.curOp.scrollToPos = null
- var from = estimateCoords(cm, range.from), to = estimateCoords(cm, range.to)
- var sPos = calculateScrollPos(cm, Math.min(from.left, to.left),
- Math.min(from.top, to.top) - range.margin,
- Math.max(from.right, to.right),
- Math.max(from.bottom, to.bottom) + range.margin)
- cm.scrollTo(sPos.scrollLeft, sPos.scrollTop)
- }
-}
-
-// Operations are used to wrap a series of changes to the editor
-// state in such a way that each change won't have to update the
-// cursor and display (which would be awkward, slow, and
-// error-prone). Instead, display updates are batched and then all
-// combined and executed at once.
-
-var nextOpId = 0
-// Start a new operation.
-function startOperation(cm) {
- cm.curOp = {
- cm: cm,
- viewChanged: false, // Flag that indicates that lines might need to be redrawn
- startHeight: cm.doc.height, // Used to detect need to update scrollbar
- forceUpdate: false, // Used to force a redraw
- updateInput: null, // Whether to reset the input textarea
- typing: false, // Whether this reset should be careful to leave existing text (for compositing)
- changeObjs: null, // Accumulated changes, for firing change events
- cursorActivityHandlers: null, // Set of handlers to fire cursorActivity on
- cursorActivityCalled: 0, // Tracks which cursorActivity handlers have been called already
- selectionChanged: false, // Whether the selection needs to be redrawn
- updateMaxLine: false, // Set when the widest line needs to be determined anew
- scrollLeft: null, scrollTop: null, // Intermediate scroll position, not pushed to DOM yet
- scrollToPos: null, // Used to scroll to a specific position
- focus: false,
- id: ++nextOpId // Unique ID
- }
- pushOperation(cm.curOp)
-}
-
-// Finish an operation, updating the display and signalling delayed events
-function endOperation(cm) {
- var op = cm.curOp
- finishOperation(op, function (group) {
- for (var i = 0; i < group.ops.length; i++)
- { group.ops[i].cm.curOp = null }
- endOperations(group)
- })
-}
-
-// The DOM updates done when an operation finishes are batched so
-// that the minimum number of relayouts are required.
-function endOperations(group) {
- var ops = group.ops
- for (var i = 0; i < ops.length; i++) // Read DOM
- { endOperation_R1(ops[i]) }
- for (var i$1 = 0; i$1 < ops.length; i$1++) // Write DOM (maybe)
- { endOperation_W1(ops[i$1]) }
- for (var i$2 = 0; i$2 < ops.length; i$2++) // Read DOM
- { endOperation_R2(ops[i$2]) }
- for (var i$3 = 0; i$3 < ops.length; i$3++) // Write DOM (maybe)
- { endOperation_W2(ops[i$3]) }
- for (var i$4 = 0; i$4 < ops.length; i$4++) // Read DOM
- { endOperation_finish(ops[i$4]) }
-}
-
-function endOperation_R1(op) {
- var cm = op.cm, display = cm.display
- maybeClipScrollbars(cm)
- if (op.updateMaxLine) { findMaxLine(cm) }
-
- op.mustUpdate = op.viewChanged || op.forceUpdate || op.scrollTop != null ||
- op.scrollToPos && (op.scrollToPos.from.line < display.viewFrom ||
- op.scrollToPos.to.line >= display.viewTo) ||
- display.maxLineChanged && cm.options.lineWrapping
- op.update = op.mustUpdate &&
- new DisplayUpdate(cm, op.mustUpdate && {top: op.scrollTop, ensure: op.scrollToPos}, op.forceUpdate)
-}
-
-function endOperation_W1(op) {
- op.updatedDisplay = op.mustUpdate && updateDisplayIfNeeded(op.cm, op.update)
-}
-
-function endOperation_R2(op) {
- var cm = op.cm, display = cm.display
- if (op.updatedDisplay) { updateHeightsInViewport(cm) }
-
- op.barMeasure = measureForScrollbars(cm)
-
- // If the max line changed since it was last measured, measure it,
- // and ensure the document's width matches it.
- // updateDisplay_W2 will use these properties to do the actual resizing
- if (display.maxLineChanged && !cm.options.lineWrapping) {
- op.adjustWidthTo = measureChar(cm, display.maxLine, display.maxLine.text.length).left + 3
- cm.display.sizerWidth = op.adjustWidthTo
- op.barMeasure.scrollWidth =
- Math.max(display.scroller.clientWidth, display.sizer.offsetLeft + op.adjustWidthTo + scrollGap(cm) + cm.display.barWidth)
- op.maxScrollLeft = Math.max(0, display.sizer.offsetLeft + op.adjustWidthTo - displayWidth(cm))
- }
-
- if (op.updatedDisplay || op.selectionChanged)
- { op.preparedSelection = display.input.prepareSelection(op.focus) }
-}
-
-function endOperation_W2(op) {
- var cm = op.cm
-
- if (op.adjustWidthTo != null) {
- cm.display.sizer.style.minWidth = op.adjustWidthTo + "px"
- if (op.maxScrollLeft < cm.doc.scrollLeft)
- { setScrollLeft(cm, Math.min(cm.display.scroller.scrollLeft, op.maxScrollLeft), true) }
- cm.display.maxLineChanged = false
- }
-
- var takeFocus = op.focus && op.focus == activeElt() && (!document.hasFocus || document.hasFocus())
- if (op.preparedSelection)
- { cm.display.input.showSelection(op.preparedSelection, takeFocus) }
- if (op.updatedDisplay || op.startHeight != cm.doc.height)
- { updateScrollbars(cm, op.barMeasure) }
- if (op.updatedDisplay)
- { setDocumentHeight(cm, op.barMeasure) }
-
- if (op.selectionChanged) { restartBlink(cm) }
-
- if (cm.state.focused && op.updateInput)
- { cm.display.input.reset(op.typing) }
- if (takeFocus) { ensureFocus(op.cm) }
-}
-
-function endOperation_finish(op) {
- var cm = op.cm, display = cm.display, doc = cm.doc
-
- if (op.updatedDisplay) { postUpdateDisplay(cm, op.update) }
-
- // Abort mouse wheel delta measurement, when scrolling explicitly
- if (display.wheelStartX != null && (op.scrollTop != null || op.scrollLeft != null || op.scrollToPos))
- { display.wheelStartX = display.wheelStartY = null }
-
- // Propagate the scroll position to the actual DOM scroller
- if (op.scrollTop != null && (display.scroller.scrollTop != op.scrollTop || op.forceScroll)) {
- doc.scrollTop = Math.max(0, Math.min(display.scroller.scrollHeight - display.scroller.clientHeight, op.scrollTop))
- display.scrollbars.setScrollTop(doc.scrollTop)
- display.scroller.scrollTop = doc.scrollTop
- }
- if (op.scrollLeft != null && (display.scroller.scrollLeft != op.scrollLeft || op.forceScroll)) {
- doc.scrollLeft = Math.max(0, Math.min(display.scroller.scrollWidth - display.scroller.clientWidth, op.scrollLeft))
- display.scrollbars.setScrollLeft(doc.scrollLeft)
- display.scroller.scrollLeft = doc.scrollLeft
- alignHorizontally(cm)
- }
- // If we need to scroll a specific position into view, do so.
- if (op.scrollToPos) {
- var coords = scrollPosIntoView(cm, clipPos(doc, op.scrollToPos.from),
- clipPos(doc, op.scrollToPos.to), op.scrollToPos.margin)
- if (op.scrollToPos.isCursor && cm.state.focused) { maybeScrollWindow(cm, coords) }
- }
-
- // Fire events for markers that are hidden/unidden by editing or
- // undoing
- var hidden = op.maybeHiddenMarkers, unhidden = op.maybeUnhiddenMarkers
- if (hidden) { for (var i = 0; i < hidden.length; ++i)
- { if (!hidden[i].lines.length) { signal(hidden[i], "hide") } } }
- if (unhidden) { for (var i$1 = 0; i$1 < unhidden.length; ++i$1)
- { if (unhidden[i$1].lines.length) { signal(unhidden[i$1], "unhide") } } }
-
- if (display.wrapper.offsetHeight)
- { doc.scrollTop = cm.display.scroller.scrollTop }
-
- // Fire change events, and delayed event handlers
- if (op.changeObjs)
- { signal(cm, "changes", cm, op.changeObjs) }
- if (op.update)
- { op.update.finish() }
-}
-
-// Run the given function in an operation
-function runInOp(cm, f) {
- if (cm.curOp) { return f() }
- startOperation(cm)
- try { return f() }
- finally { endOperation(cm) }
-}
-// Wraps a function in an operation. Returns the wrapped function.
-function operation(cm, f) {
- return function() {
- if (cm.curOp) { return f.apply(cm, arguments) }
- startOperation(cm)
- try { return f.apply(cm, arguments) }
- finally { endOperation(cm) }
- }
-}
-// Used to add methods to editor and doc instances, wrapping them in
-// operations.
-function methodOp(f) {
- return function() {
- if (this.curOp) { return f.apply(this, arguments) }
- startOperation(this)
- try { return f.apply(this, arguments) }
- finally { endOperation(this) }
- }
-}
-function docMethodOp(f) {
- return function() {
- var cm = this.cm
- if (!cm || cm.curOp) { return f.apply(this, arguments) }
- startOperation(cm)
- try { return f.apply(this, arguments) }
- finally { endOperation(cm) }
- }
-}
-
-// Updates the display.view data structure for a given change to the
-// document. From and to are in pre-change coordinates. Lendiff is
-// the amount of lines added or subtracted by the change. This is
-// used for changes that span multiple lines, or change the way
-// lines are divided into visual lines. regLineChange (below)
-// registers single-line changes.
-function regChange(cm, from, to, lendiff) {
- if (from == null) { from = cm.doc.first }
- if (to == null) { to = cm.doc.first + cm.doc.size }
- if (!lendiff) { lendiff = 0 }
-
- var display = cm.display
- if (lendiff && to < display.viewTo &&
- (display.updateLineNumbers == null || display.updateLineNumbers > from))
- { display.updateLineNumbers = from }
-
- cm.curOp.viewChanged = true
-
- if (from >= display.viewTo) { // Change after
- if (sawCollapsedSpans && visualLineNo(cm.doc, from) < display.viewTo)
- { resetView(cm) }
- } else if (to <= display.viewFrom) { // Change before
- if (sawCollapsedSpans && visualLineEndNo(cm.doc, to + lendiff) > display.viewFrom) {
- resetView(cm)
- } else {
- display.viewFrom += lendiff
- display.viewTo += lendiff
- }
- } else if (from <= display.viewFrom && to >= display.viewTo) { // Full overlap
- resetView(cm)
- } else if (from <= display.viewFrom) { // Top overlap
- var cut = viewCuttingPoint(cm, to, to + lendiff, 1)
- if (cut) {
- display.view = display.view.slice(cut.index)
- display.viewFrom = cut.lineN
- display.viewTo += lendiff
- } else {
- resetView(cm)
- }
- } else if (to >= display.viewTo) { // Bottom overlap
- var cut$1 = viewCuttingPoint(cm, from, from, -1)
- if (cut$1) {
- display.view = display.view.slice(0, cut$1.index)
- display.viewTo = cut$1.lineN
- } else {
- resetView(cm)
- }
- } else { // Gap in the middle
- var cutTop = viewCuttingPoint(cm, from, from, -1)
- var cutBot = viewCuttingPoint(cm, to, to + lendiff, 1)
- if (cutTop && cutBot) {
- display.view = display.view.slice(0, cutTop.index)
- .concat(buildViewArray(cm, cutTop.lineN, cutBot.lineN))
- .concat(display.view.slice(cutBot.index))
- display.viewTo += lendiff
- } else {
- resetView(cm)
- }
- }
-
- var ext = display.externalMeasured
- if (ext) {
- if (to < ext.lineN)
- { ext.lineN += lendiff }
- else if (from < ext.lineN + ext.size)
- { display.externalMeasured = null }
- }
-}
-
-// Register a change to a single line. Type must be one of "text",
-// "gutter", "class", "widget"
-function regLineChange(cm, line, type) {
- cm.curOp.viewChanged = true
- var display = cm.display, ext = cm.display.externalMeasured
- if (ext && line >= ext.lineN && line < ext.lineN + ext.size)
- { display.externalMeasured = null }
-
- if (line < display.viewFrom || line >= display.viewTo) { return }
- var lineView = display.view[findViewIndex(cm, line)]
- if (lineView.node == null) { return }
- var arr = lineView.changes || (lineView.changes = [])
- if (indexOf(arr, type) == -1) { arr.push(type) }
-}
-
-// Clear the view.
-function resetView(cm) {
- cm.display.viewFrom = cm.display.viewTo = cm.doc.first
- cm.display.view = []
- cm.display.viewOffset = 0
-}
-
-function viewCuttingPoint(cm, oldN, newN, dir) {
- var index = findViewIndex(cm, oldN), diff, view = cm.display.view
- if (!sawCollapsedSpans || newN == cm.doc.first + cm.doc.size)
- { return {index: index, lineN: newN} }
- var n = cm.display.viewFrom
- for (var i = 0; i < index; i++)
- { n += view[i].size }
- if (n != oldN) {
- if (dir > 0) {
- if (index == view.length - 1) { return null }
- diff = (n + view[index].size) - oldN
- index++
- } else {
- diff = n - oldN
- }
- oldN += diff; newN += diff
- }
- while (visualLineNo(cm.doc, newN) != newN) {
- if (index == (dir < 0 ? 0 : view.length - 1)) { return null }
- newN += dir * view[index - (dir < 0 ? 1 : 0)].size
- index += dir
- }
- return {index: index, lineN: newN}
-}
-
-// Force the view to cover a given range, adding empty view element
-// or clipping off existing ones as needed.
-function adjustView(cm, from, to) {
- var display = cm.display, view = display.view
- if (view.length == 0 || from >= display.viewTo || to <= display.viewFrom) {
- display.view = buildViewArray(cm, from, to)
- display.viewFrom = from
- } else {
- if (display.viewFrom > from)
- { display.view = buildViewArray(cm, from, display.viewFrom).concat(display.view) }
- else if (display.viewFrom < from)
- { display.view = display.view.slice(findViewIndex(cm, from)) }
- display.viewFrom = from
- if (display.viewTo < to)
- { display.view = display.view.concat(buildViewArray(cm, display.viewTo, to)) }
- else if (display.viewTo > to)
- { display.view = display.view.slice(0, findViewIndex(cm, to)) }
- }
- display.viewTo = to
-}
-
-// Count the number of lines in the view whose DOM representation is
-// out of date (or nonexistent).
-function countDirtyView(cm) {
- var view = cm.display.view, dirty = 0
- for (var i = 0; i < view.length; i++) {
- var lineView = view[i]
- if (!lineView.hidden && (!lineView.node || lineView.changes)) { ++dirty }
- }
- return dirty
-}
-
-// HIGHLIGHT WORKER
-
-function startWorker(cm, time) {
- if (cm.doc.mode.startState && cm.doc.frontier < cm.display.viewTo)
- { cm.state.highlight.set(time, bind(highlightWorker, cm)) }
-}
-
-function highlightWorker(cm) {
- var doc = cm.doc
- if (doc.frontier < doc.first) { doc.frontier = doc.first }
- if (doc.frontier >= cm.display.viewTo) { return }
- var end = +new Date + cm.options.workTime
- var state = copyState(doc.mode, getStateBefore(cm, doc.frontier))
- var changedLines = []
-
- doc.iter(doc.frontier, Math.min(doc.first + doc.size, cm.display.viewTo + 500), function (line) {
- if (doc.frontier >= cm.display.viewFrom) { // Visible
- var oldStyles = line.styles, tooLong = line.text.length > cm.options.maxHighlightLength
- var highlighted = highlightLine(cm, line, tooLong ? copyState(doc.mode, state) : state, true)
- line.styles = highlighted.styles
- var oldCls = line.styleClasses, newCls = highlighted.classes
- if (newCls) { line.styleClasses = newCls }
- else if (oldCls) { line.styleClasses = null }
- var ischange = !oldStyles || oldStyles.length != line.styles.length ||
- oldCls != newCls && (!oldCls || !newCls || oldCls.bgClass != newCls.bgClass || oldCls.textClass != newCls.textClass)
- for (var i = 0; !ischange && i < oldStyles.length; ++i) { ischange = oldStyles[i] != line.styles[i] }
- if (ischange) { changedLines.push(doc.frontier) }
- line.stateAfter = tooLong ? state : copyState(doc.mode, state)
- } else {
- if (line.text.length <= cm.options.maxHighlightLength)
- { processLine(cm, line.text, state) }
- line.stateAfter = doc.frontier % 5 == 0 ? copyState(doc.mode, state) : null
- }
- ++doc.frontier
- if (+new Date > end) {
- startWorker(cm, cm.options.workDelay)
- return true
- }
- })
- if (changedLines.length) { runInOp(cm, function () {
- for (var i = 0; i < changedLines.length; i++)
- { regLineChange(cm, changedLines[i], "text") }
- }) }
-}
-
-// DISPLAY DRAWING
-
-var DisplayUpdate = function(cm, viewport, force) {
- var display = cm.display
-
- this.viewport = viewport
- // Store some values that we'll need later (but don't want to force a relayout for)
- this.visible = visibleLines(display, cm.doc, viewport)
- this.editorIsHidden = !display.wrapper.offsetWidth
- this.wrapperHeight = display.wrapper.clientHeight
- this.wrapperWidth = display.wrapper.clientWidth
- this.oldDisplayWidth = displayWidth(cm)
- this.force = force
- this.dims = getDimensions(cm)
- this.events = []
-};
-
-DisplayUpdate.prototype.signal = function (emitter, type) {
- if (hasHandler(emitter, type))
- { this.events.push(arguments) }
-};
-DisplayUpdate.prototype.finish = function () {
- var this$1 = this;
-
- for (var i = 0; i < this.events.length; i++)
- { signal.apply(null, this$1.events[i]) }
-};
-
-function maybeClipScrollbars(cm) {
- var display = cm.display
- if (!display.scrollbarsClipped && display.scroller.offsetWidth) {
- display.nativeBarWidth = display.scroller.offsetWidth - display.scroller.clientWidth
- display.heightForcer.style.height = scrollGap(cm) + "px"
- display.sizer.style.marginBottom = -display.nativeBarWidth + "px"
- display.sizer.style.borderRightWidth = scrollGap(cm) + "px"
- display.scrollbarsClipped = true
- }
-}
-
-// Does the actual updating of the line display. Bails out
-// (returning false) when there is nothing to be done and forced is
-// false.
-function updateDisplayIfNeeded(cm, update) {
- var display = cm.display, doc = cm.doc
-
- if (update.editorIsHidden) {
- resetView(cm)
- return false
- }
-
- // Bail out if the visible area is already rendered and nothing changed.
- if (!update.force &&
- update.visible.from >= display.viewFrom && update.visible.to <= display.viewTo &&
- (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo) &&
- display.renderedView == display.view && countDirtyView(cm) == 0)
- { return false }
-
- if (maybeUpdateLineNumberWidth(cm)) {
- resetView(cm)
- update.dims = getDimensions(cm)
- }
-
- // Compute a suitable new viewport (from & to)
- var end = doc.first + doc.size
- var from = Math.max(update.visible.from - cm.options.viewportMargin, doc.first)
- var to = Math.min(end, update.visible.to + cm.options.viewportMargin)
- if (display.viewFrom < from && from - display.viewFrom < 20) { from = Math.max(doc.first, display.viewFrom) }
- if (display.viewTo > to && display.viewTo - to < 20) { to = Math.min(end, display.viewTo) }
- if (sawCollapsedSpans) {
- from = visualLineNo(cm.doc, from)
- to = visualLineEndNo(cm.doc, to)
- }
-
- var different = from != display.viewFrom || to != display.viewTo ||
- display.lastWrapHeight != update.wrapperHeight || display.lastWrapWidth != update.wrapperWidth
- adjustView(cm, from, to)
-
- display.viewOffset = heightAtLine(getLine(cm.doc, display.viewFrom))
- // Position the mover div to align with the current scroll position
- cm.display.mover.style.top = display.viewOffset + "px"
-
- var toUpdate = countDirtyView(cm)
- if (!different && toUpdate == 0 && !update.force && display.renderedView == display.view &&
- (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo))
- { return false }
-
- // For big changes, we hide the enclosing element during the
- // update, since that speeds up the operations on most browsers.
- var focused = activeElt()
- if (toUpdate > 4) { display.lineDiv.style.display = "none" }
- patchDisplay(cm, display.updateLineNumbers, update.dims)
- if (toUpdate > 4) { display.lineDiv.style.display = "" }
- display.renderedView = display.view
- // There might have been a widget with a focused element that got
- // hidden or updated, if so re-focus it.
- if (focused && activeElt() != focused && focused.offsetHeight) { focused.focus() }
-
- // Prevent selection and cursors from interfering with the scroll
- // width and height.
- removeChildren(display.cursorDiv)
- removeChildren(display.selectionDiv)
- display.gutters.style.height = display.sizer.style.minHeight = 0
-
- if (different) {
- display.lastWrapHeight = update.wrapperHeight
- display.lastWrapWidth = update.wrapperWidth
- startWorker(cm, 400)
- }
-
- display.updateLineNumbers = null
-
- return true
-}
-
-function postUpdateDisplay(cm, update) {
- var viewport = update.viewport
-
- for (var first = true;; first = false) {
- if (!first || !cm.options.lineWrapping || update.oldDisplayWidth == displayWidth(cm)) {
- // Clip forced viewport to actual scrollable area.
- if (viewport && viewport.top != null)
- { viewport = {top: Math.min(cm.doc.height + paddingVert(cm.display) - displayHeight(cm), viewport.top)} }
- // Updated line heights might result in the drawn area not
- // actually covering the viewport. Keep looping until it does.
- update.visible = visibleLines(cm.display, cm.doc, viewport)
- if (update.visible.from >= cm.display.viewFrom && update.visible.to <= cm.display.viewTo)
- { break }
- }
- if (!updateDisplayIfNeeded(cm, update)) { break }
- updateHeightsInViewport(cm)
- var barMeasure = measureForScrollbars(cm)
- updateSelection(cm)
- updateScrollbars(cm, barMeasure)
- setDocumentHeight(cm, barMeasure)
- }
-
- update.signal(cm, "update", cm)
- if (cm.display.viewFrom != cm.display.reportedViewFrom || cm.display.viewTo != cm.display.reportedViewTo) {
- update.signal(cm, "viewportChange", cm, cm.display.viewFrom, cm.display.viewTo)
- cm.display.reportedViewFrom = cm.display.viewFrom; cm.display.reportedViewTo = cm.display.viewTo
- }
-}
-
-function updateDisplaySimple(cm, viewport) {
- var update = new DisplayUpdate(cm, viewport)
- if (updateDisplayIfNeeded(cm, update)) {
- updateHeightsInViewport(cm)
- postUpdateDisplay(cm, update)
- var barMeasure = measureForScrollbars(cm)
- updateSelection(cm)
- updateScrollbars(cm, barMeasure)
- setDocumentHeight(cm, barMeasure)
- update.finish()
- }
-}
-
-// Sync the actual display DOM structure with display.view, removing
-// nodes for lines that are no longer in view, and creating the ones
-// that are not there yet, and updating the ones that are out of
-// date.
-function patchDisplay(cm, updateNumbersFrom, dims) {
- var display = cm.display, lineNumbers = cm.options.lineNumbers
- var container = display.lineDiv, cur = container.firstChild
-
- function rm(node) {
- var next = node.nextSibling
- // Works around a throw-scroll bug in OS X Webkit
- if (webkit && mac && cm.display.currentWheelTarget == node)
- { node.style.display = "none" }
- else
- { node.parentNode.removeChild(node) }
- return next
- }
-
- var view = display.view, lineN = display.viewFrom
- // Loop over the elements in the view, syncing cur (the DOM nodes
- // in display.lineDiv) with the view as we go.
- for (var i = 0; i < view.length; i++) {
- var lineView = view[i]
- if (lineView.hidden) {
- } else if (!lineView.node || lineView.node.parentNode != container) { // Not drawn yet
- var node = buildLineElement(cm, lineView, lineN, dims)
- container.insertBefore(node, cur)
- } else { // Already drawn
- while (cur != lineView.node) { cur = rm(cur) }
- var updateNumber = lineNumbers && updateNumbersFrom != null &&
- updateNumbersFrom <= lineN && lineView.lineNumber
- if (lineView.changes) {
- if (indexOf(lineView.changes, "gutter") > -1) { updateNumber = false }
- updateLineForChanges(cm, lineView, lineN, dims)
- }
- if (updateNumber) {
- removeChildren(lineView.lineNumber)
- lineView.lineNumber.appendChild(document.createTextNode(lineNumberFor(cm.options, lineN)))
- }
- cur = lineView.node.nextSibling
- }
- lineN += lineView.size
- }
- while (cur) { cur = rm(cur) }
-}
-
-function updateGutterSpace(cm) {
- var width = cm.display.gutters.offsetWidth
- cm.display.sizer.style.marginLeft = width + "px"
-}
-
-function setDocumentHeight(cm, measure) {
- cm.display.sizer.style.minHeight = measure.docHeight + "px"
- cm.display.heightForcer.style.top = measure.docHeight + "px"
- cm.display.gutters.style.height = (measure.docHeight + cm.display.barHeight + scrollGap(cm)) + "px"
-}
-
-// Rebuild the gutter elements, ensure the margin to the left of the
-// code matches their width.
-function updateGutters(cm) {
- var gutters = cm.display.gutters, specs = cm.options.gutters
- removeChildren(gutters)
- var i = 0
- for (; i < specs.length; ++i) {
- var gutterClass = specs[i]
- var gElt = gutters.appendChild(elt("div", null, "CodeMirror-gutter " + gutterClass))
- if (gutterClass == "CodeMirror-linenumbers") {
- cm.display.lineGutter = gElt
- gElt.style.width = (cm.display.lineNumWidth || 1) + "px"
- }
- }
- gutters.style.display = i ? "" : "none"
- updateGutterSpace(cm)
-}
-
-// Make sure the gutters options contains the element
-// "CodeMirror-linenumbers" when the lineNumbers option is true.
-function setGuttersForLineNumbers(options) {
- var found = indexOf(options.gutters, "CodeMirror-linenumbers")
- if (found == -1 && options.lineNumbers) {
- options.gutters = options.gutters.concat(["CodeMirror-linenumbers"])
- } else if (found > -1 && !options.lineNumbers) {
- options.gutters = options.gutters.slice(0)
- options.gutters.splice(found, 1)
- }
-}
-
-// Selection objects are immutable. A new one is created every time
-// the selection changes. A selection is one or more non-overlapping
-// (and non-touching) ranges, sorted, and an integer that indicates
-// which one is the primary selection (the one that's scrolled into
-// view, that getCursor returns, etc).
-function Selection(ranges, primIndex) {
- this.ranges = ranges
- this.primIndex = primIndex
-}
-
-Selection.prototype = {
- primary: function() { return this.ranges[this.primIndex] },
- equals: function(other) {
- var this$1 = this;
-
- if (other == this) { return true }
- if (other.primIndex != this.primIndex || other.ranges.length != this.ranges.length) { return false }
- for (var i = 0; i < this.ranges.length; i++) {
- var here = this$1.ranges[i], there = other.ranges[i]
- if (cmp(here.anchor, there.anchor) != 0 || cmp(here.head, there.head) != 0) { return false }
- }
- return true
- },
- deepCopy: function() {
- var this$1 = this;
-
- var out = []
- for (var i = 0; i < this.ranges.length; i++)
- { out[i] = new Range(copyPos(this$1.ranges[i].anchor), copyPos(this$1.ranges[i].head)) }
- return new Selection(out, this.primIndex)
- },
- somethingSelected: function() {
- var this$1 = this;
-
- for (var i = 0; i < this.ranges.length; i++)
- { if (!this$1.ranges[i].empty()) { return true } }
- return false
- },
- contains: function(pos, end) {
- var this$1 = this;
-
- if (!end) { end = pos }
- for (var i = 0; i < this.ranges.length; i++) {
- var range = this$1.ranges[i]
- if (cmp(end, range.from()) >= 0 && cmp(pos, range.to()) <= 0)
- { return i }
- }
- return -1
- }
-}
-
-function Range(anchor, head) {
- this.anchor = anchor; this.head = head
-}
-
-Range.prototype = {
- from: function() { return minPos(this.anchor, this.head) },
- to: function() { return maxPos(this.anchor, this.head) },
- empty: function() {
- return this.head.line == this.anchor.line && this.head.ch == this.anchor.ch
- }
-}
-
-// Take an unsorted, potentially overlapping set of ranges, and
-// build a selection out of it. 'Consumes' ranges array (modifying
-// it).
-function normalizeSelection(ranges, primIndex) {
- var prim = ranges[primIndex]
- ranges.sort(function (a, b) { return cmp(a.from(), b.from()); })
- primIndex = indexOf(ranges, prim)
- for (var i = 1; i < ranges.length; i++) {
- var cur = ranges[i], prev = ranges[i - 1]
- if (cmp(prev.to(), cur.from()) >= 0) {
- var from = minPos(prev.from(), cur.from()), to = maxPos(prev.to(), cur.to())
- var inv = prev.empty() ? cur.from() == cur.head : prev.from() == prev.head
- if (i <= primIndex) { --primIndex }
- ranges.splice(--i, 2, new Range(inv ? to : from, inv ? from : to))
- }
- }
- return new Selection(ranges, primIndex)
-}
-
-function simpleSelection(anchor, head) {
- return new Selection([new Range(anchor, head || anchor)], 0)
-}
-
-// Compute the position of the end of a change (its 'to' property
-// refers to the pre-change end).
-function changeEnd(change) {
- if (!change.text) { return change.to }
- return Pos(change.from.line + change.text.length - 1,
- lst(change.text).length + (change.text.length == 1 ? change.from.ch : 0))
-}
-
-// Adjust a position to refer to the post-change position of the
-// same text, or the end of the change if the change covers it.
-function adjustForChange(pos, change) {
- if (cmp(pos, change.from) < 0) { return pos }
- if (cmp(pos, change.to) <= 0) { return changeEnd(change) }
-
- var line = pos.line + change.text.length - (change.to.line - change.from.line) - 1, ch = pos.ch
- if (pos.line == change.to.line) { ch += changeEnd(change).ch - change.to.ch }
- return Pos(line, ch)
-}
-
-function computeSelAfterChange(doc, change) {
- var out = []
- for (var i = 0; i < doc.sel.ranges.length; i++) {
- var range = doc.sel.ranges[i]
- out.push(new Range(adjustForChange(range.anchor, change),
- adjustForChange(range.head, change)))
- }
- return normalizeSelection(out, doc.sel.primIndex)
-}
-
-function offsetPos(pos, old, nw) {
- if (pos.line == old.line)
- { return Pos(nw.line, pos.ch - old.ch + nw.ch) }
- else
- { return Pos(nw.line + (pos.line - old.line), pos.ch) }
-}
-
-// Used by replaceSelections to allow moving the selection to the
-// start or around the replaced test. Hint may be "start" or "around".
-function computeReplacedSel(doc, changes, hint) {
- var out = []
- var oldPrev = Pos(doc.first, 0), newPrev = oldPrev
- for (var i = 0; i < changes.length; i++) {
- var change = changes[i]
- var from = offsetPos(change.from, oldPrev, newPrev)
- var to = offsetPos(changeEnd(change), oldPrev, newPrev)
- oldPrev = change.to
- newPrev = to
- if (hint == "around") {
- var range = doc.sel.ranges[i], inv = cmp(range.head, range.anchor) < 0
- out[i] = new Range(inv ? to : from, inv ? from : to)
- } else {
- out[i] = new Range(from, from)
- }
- }
- return new Selection(out, doc.sel.primIndex)
-}
-
-// Used to get the editor into a consistent state again when options change.
-
-function loadMode(cm) {
- cm.doc.mode = getMode(cm.options, cm.doc.modeOption)
- resetModeState(cm)
-}
-
-function resetModeState(cm) {
- cm.doc.iter(function (line) {
- if (line.stateAfter) { line.stateAfter = null }
- if (line.styles) { line.styles = null }
- })
- cm.doc.frontier = cm.doc.first
- startWorker(cm, 100)
- cm.state.modeGen++
- if (cm.curOp) { regChange(cm) }
-}
-
-// DOCUMENT DATA STRUCTURE
-
-// By default, updates that start and end at the beginning of a line
-// are treated specially, in order to make the association of line
-// widgets and marker elements with the text behave more intuitive.
-function isWholeLineUpdate(doc, change) {
- return change.from.ch == 0 && change.to.ch == 0 && lst(change.text) == "" &&
- (!doc.cm || doc.cm.options.wholeLineUpdateBefore)
-}
-
-// Perform a change on the document data structure.
-function updateDoc(doc, change, markedSpans, estimateHeight) {
- function spansFor(n) {return markedSpans ? markedSpans[n] : null}
- function update(line, text, spans) {
- updateLine(line, text, spans, estimateHeight)
- signalLater(line, "change", line, change)
- }
- function linesFor(start, end) {
- var result = []
- for (var i = start; i < end; ++i)
- { result.push(new Line(text[i], spansFor(i), estimateHeight)) }
- return result
- }
-
- var from = change.from, to = change.to, text = change.text
- var firstLine = getLine(doc, from.line), lastLine = getLine(doc, to.line)
- var lastText = lst(text), lastSpans = spansFor(text.length - 1), nlines = to.line - from.line
-
- // Adjust the line structure
- if (change.full) {
- doc.insert(0, linesFor(0, text.length))
- doc.remove(text.length, doc.size - text.length)
- } else if (isWholeLineUpdate(doc, change)) {
- // This is a whole-line replace. Treated specially to make
- // sure line objects move the way they are supposed to.
- var added = linesFor(0, text.length - 1)
- update(lastLine, lastLine.text, lastSpans)
- if (nlines) { doc.remove(from.line, nlines) }
- if (added.length) { doc.insert(from.line, added) }
- } else if (firstLine == lastLine) {
- if (text.length == 1) {
- update(firstLine, firstLine.text.slice(0, from.ch) + lastText + firstLine.text.slice(to.ch), lastSpans)
- } else {
- var added$1 = linesFor(1, text.length - 1)
- added$1.push(new Line(lastText + firstLine.text.slice(to.ch), lastSpans, estimateHeight))
- update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0))
- doc.insert(from.line + 1, added$1)
- }
- } else if (text.length == 1) {
- update(firstLine, firstLine.text.slice(0, from.ch) + text[0] + lastLine.text.slice(to.ch), spansFor(0))
- doc.remove(from.line + 1, nlines)
- } else {
- update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0))
- update(lastLine, lastText + lastLine.text.slice(to.ch), lastSpans)
- var added$2 = linesFor(1, text.length - 1)
- if (nlines > 1) { doc.remove(from.line + 1, nlines - 1) }
- doc.insert(from.line + 1, added$2)
- }
-
- signalLater(doc, "change", doc, change)
-}
-
-// Call f for all linked documents.
-function linkedDocs(doc, f, sharedHistOnly) {
- function propagate(doc, skip, sharedHist) {
- if (doc.linked) { for (var i = 0; i < doc.linked.length; ++i) {
- var rel = doc.linked[i]
- if (rel.doc == skip) { continue }
- var shared = sharedHist && rel.sharedHist
- if (sharedHistOnly && !shared) { continue }
- f(rel.doc, shared)
- propagate(rel.doc, doc, shared)
- } }
- }
- propagate(doc, null, true)
-}
-
-// Attach a document to an editor.
-function attachDoc(cm, doc) {
- if (doc.cm) { throw new Error("This document is already in use.") }
- cm.doc = doc
- doc.cm = cm
- estimateLineHeights(cm)
- loadMode(cm)
- if (!cm.options.lineWrapping) { findMaxLine(cm) }
- cm.options.mode = doc.modeOption
- regChange(cm)
-}
-
-function History(startGen) {
- // Arrays of change events and selections. Doing something adds an
- // event to done and clears undo. Undoing moves events from done
- // to undone, redoing moves them in the other direction.
- this.done = []; this.undone = []
- this.undoDepth = Infinity
- // Used to track when changes can be merged into a single undo
- // event
- this.lastModTime = this.lastSelTime = 0
- this.lastOp = this.lastSelOp = null
- this.lastOrigin = this.lastSelOrigin = null
- // Used by the isClean() method
- this.generation = this.maxGeneration = startGen || 1
-}
-
-// Create a history change event from an updateDoc-style change
-// object.
-function historyChangeFromChange(doc, change) {
- var histChange = {from: copyPos(change.from), to: changeEnd(change), text: getBetween(doc, change.from, change.to)}
- attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1)
- linkedDocs(doc, function (doc) { return attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1); }, true)
- return histChange
-}
-
-// Pop all selection events off the end of a history array. Stop at
-// a change event.
-function clearSelectionEvents(array) {
- while (array.length) {
- var last = lst(array)
- if (last.ranges) { array.pop() }
- else { break }
- }
-}
-
-// Find the top change event in the history. Pop off selection
-// events that are in the way.
-function lastChangeEvent(hist, force) {
- if (force) {
- clearSelectionEvents(hist.done)
- return lst(hist.done)
- } else if (hist.done.length && !lst(hist.done).ranges) {
- return lst(hist.done)
- } else if (hist.done.length > 1 && !hist.done[hist.done.length - 2].ranges) {
- hist.done.pop()
- return lst(hist.done)
- }
-}
-
-// Register a change in the history. Merges changes that are within
-// a single operation, or are close together with an origin that
-// allows merging (starting with "+") into a single event.
-function addChangeToHistory(doc, change, selAfter, opId) {
- var hist = doc.history
- hist.undone.length = 0
- var time = +new Date, cur
- var last
-
- if ((hist.lastOp == opId ||
- hist.lastOrigin == change.origin && change.origin &&
- ((change.origin.charAt(0) == "+" && doc.cm && hist.lastModTime > time - doc.cm.options.historyEventDelay) ||
- change.origin.charAt(0) == "*")) &&
- (cur = lastChangeEvent(hist, hist.lastOp == opId))) {
- // Merge this change into the last event
- last = lst(cur.changes)
- if (cmp(change.from, change.to) == 0 && cmp(change.from, last.to) == 0) {
- // Optimized case for simple insertion -- don't want to add
- // new changesets for every character typed
- last.to = changeEnd(change)
- } else {
- // Add new sub-event
- cur.changes.push(historyChangeFromChange(doc, change))
- }
- } else {
- // Can not be merged, start a new event.
- var before = lst(hist.done)
- if (!before || !before.ranges)
- { pushSelectionToHistory(doc.sel, hist.done) }
- cur = {changes: [historyChangeFromChange(doc, change)],
- generation: hist.generation}
- hist.done.push(cur)
- while (hist.done.length > hist.undoDepth) {
- hist.done.shift()
- if (!hist.done[0].ranges) { hist.done.shift() }
- }
- }
- hist.done.push(selAfter)
- hist.generation = ++hist.maxGeneration
- hist.lastModTime = hist.lastSelTime = time
- hist.lastOp = hist.lastSelOp = opId
- hist.lastOrigin = hist.lastSelOrigin = change.origin
-
- if (!last) { signal(doc, "historyAdded") }
-}
-
-function selectionEventCanBeMerged(doc, origin, prev, sel) {
- var ch = origin.charAt(0)
- return ch == "*" ||
- ch == "+" &&
- prev.ranges.length == sel.ranges.length &&
- prev.somethingSelected() == sel.somethingSelected() &&
- new Date - doc.history.lastSelTime <= (doc.cm ? doc.cm.options.historyEventDelay : 500)
-}
-
-// Called whenever the selection changes, sets the new selection as
-// the pending selection in the history, and pushes the old pending
-// selection into the 'done' array when it was significantly
-// different (in number of selected ranges, emptiness, or time).
-function addSelectionToHistory(doc, sel, opId, options) {
- var hist = doc.history, origin = options && options.origin
-
- // A new event is started when the previous origin does not match
- // the current, or the origins don't allow matching. Origins
- // starting with * are always merged, those starting with + are
- // merged when similar and close together in time.
- if (opId == hist.lastSelOp ||
- (origin && hist.lastSelOrigin == origin &&
- (hist.lastModTime == hist.lastSelTime && hist.lastOrigin == origin ||
- selectionEventCanBeMerged(doc, origin, lst(hist.done), sel))))
- { hist.done[hist.done.length - 1] = sel }
- else
- { pushSelectionToHistory(sel, hist.done) }
-
- hist.lastSelTime = +new Date
- hist.lastSelOrigin = origin
- hist.lastSelOp = opId
- if (options && options.clearRedo !== false)
- { clearSelectionEvents(hist.undone) }
-}
-
-function pushSelectionToHistory(sel, dest) {
- var top = lst(dest)
- if (!(top && top.ranges && top.equals(sel)))
- { dest.push(sel) }
-}
-
-// Used to store marked span information in the history.
-function attachLocalSpans(doc, change, from, to) {
- var existing = change["spans_" + doc.id], n = 0
- doc.iter(Math.max(doc.first, from), Math.min(doc.first + doc.size, to), function (line) {
- if (line.markedSpans)
- { (existing || (existing = change["spans_" + doc.id] = {}))[n] = line.markedSpans }
- ++n
- })
-}
-
-// When un/re-doing restores text containing marked spans, those
-// that have been explicitly cleared should not be restored.
-function removeClearedSpans(spans) {
- if (!spans) { return null }
- var out
- for (var i = 0; i < spans.length; ++i) {
- if (spans[i].marker.explicitlyCleared) { if (!out) { out = spans.slice(0, i) } }
- else if (out) { out.push(spans[i]) }
- }
- return !out ? spans : out.length ? out : null
-}
-
-// Retrieve and filter the old marked spans stored in a change event.
-function getOldSpans(doc, change) {
- var found = change["spans_" + doc.id]
- if (!found) { return null }
- var nw = []
- for (var i = 0; i < change.text.length; ++i)
- { nw.push(removeClearedSpans(found[i])) }
- return nw
-}
-
-// Used for un/re-doing changes from the history. Combines the
-// result of computing the existing spans with the set of spans that
-// existed in the history (so that deleting around a span and then
-// undoing brings back the span).
-function mergeOldSpans(doc, change) {
- var old = getOldSpans(doc, change)
- var stretched = stretchSpansOverChange(doc, change)
- if (!old) { return stretched }
- if (!stretched) { return old }
-
- for (var i = 0; i < old.length; ++i) {
- var oldCur = old[i], stretchCur = stretched[i]
- if (oldCur && stretchCur) {
- spans: for (var j = 0; j < stretchCur.length; ++j) {
- var span = stretchCur[j]
- for (var k = 0; k < oldCur.length; ++k)
- { if (oldCur[k].marker == span.marker) { continue spans } }
- oldCur.push(span)
- }
- } else if (stretchCur) {
- old[i] = stretchCur
- }
- }
- return old
-}
-
-// Used both to provide a JSON-safe object in .getHistory, and, when
-// detaching a document, to split the history in two
-function copyHistoryArray(events, newGroup, instantiateSel) {
- var copy = []
- for (var i = 0; i < events.length; ++i) {
- var event = events[i]
- if (event.ranges) {
- copy.push(instantiateSel ? Selection.prototype.deepCopy.call(event) : event)
- continue
- }
- var changes = event.changes, newChanges = []
- copy.push({changes: newChanges})
- for (var j = 0; j < changes.length; ++j) {
- var change = changes[j], m = (void 0)
- newChanges.push({from: change.from, to: change.to, text: change.text})
- if (newGroup) { for (var prop in change) { if (m = prop.match(/^spans_(\d+)$/)) {
- if (indexOf(newGroup, Number(m[1])) > -1) {
- lst(newChanges)[prop] = change[prop]
- delete change[prop]
- }
- } } }
- }
- }
- return copy
-}
-
-// The 'scroll' parameter given to many of these indicated whether
-// the new cursor position should be scrolled into view after
-// modifying the selection.
-
-// If shift is held or the extend flag is set, extends a range to
-// include a given position (and optionally a second position).
-// Otherwise, simply returns the range between the given positions.
-// Used for cursor motion and such.
-function extendRange(doc, range, head, other) {
- if (doc.cm && doc.cm.display.shift || doc.extend) {
- var anchor = range.anchor
- if (other) {
- var posBefore = cmp(head, anchor) < 0
- if (posBefore != (cmp(other, anchor) < 0)) {
- anchor = head
- head = other
- } else if (posBefore != (cmp(head, other) < 0)) {
- head = other
- }
- }
- return new Range(anchor, head)
- } else {
- return new Range(other || head, head)
- }
-}
-
-// Extend the primary selection range, discard the rest.
-function extendSelection(doc, head, other, options) {
- setSelection(doc, new Selection([extendRange(doc, doc.sel.primary(), head, other)], 0), options)
-}
-
-// Extend all selections (pos is an array of selections with length
-// equal the number of selections)
-function extendSelections(doc, heads, options) {
- var out = []
- for (var i = 0; i < doc.sel.ranges.length; i++)
- { out[i] = extendRange(doc, doc.sel.ranges[i], heads[i], null) }
- var newSel = normalizeSelection(out, doc.sel.primIndex)
- setSelection(doc, newSel, options)
-}
-
-// Updates a single range in the selection.
-function replaceOneSelection(doc, i, range, options) {
- var ranges = doc.sel.ranges.slice(0)
- ranges[i] = range
- setSelection(doc, normalizeSelection(ranges, doc.sel.primIndex), options)
-}
-
-// Reset the selection to a single range.
-function setSimpleSelection(doc, anchor, head, options) {
- setSelection(doc, simpleSelection(anchor, head), options)
-}
-
-// Give beforeSelectionChange handlers a change to influence a
-// selection update.
-function filterSelectionChange(doc, sel, options) {
- var obj = {
- ranges: sel.ranges,
- update: function(ranges) {
- var this$1 = this;
-
- this.ranges = []
- for (var i = 0; i < ranges.length; i++)
- { this$1.ranges[i] = new Range(clipPos(doc, ranges[i].anchor),
- clipPos(doc, ranges[i].head)) }
- },
- origin: options && options.origin
- }
- signal(doc, "beforeSelectionChange", doc, obj)
- if (doc.cm) { signal(doc.cm, "beforeSelectionChange", doc.cm, obj) }
- if (obj.ranges != sel.ranges) { return normalizeSelection(obj.ranges, obj.ranges.length - 1) }
- else { return sel }
-}
-
-function setSelectionReplaceHistory(doc, sel, options) {
- var done = doc.history.done, last = lst(done)
- if (last && last.ranges) {
- done[done.length - 1] = sel
- setSelectionNoUndo(doc, sel, options)
- } else {
- setSelection(doc, sel, options)
- }
-}
-
-// Set a new selection.
-function setSelection(doc, sel, options) {
- setSelectionNoUndo(doc, sel, options)
- addSelectionToHistory(doc, doc.sel, doc.cm ? doc.cm.curOp.id : NaN, options)
-}
-
-function setSelectionNoUndo(doc, sel, options) {
- if (hasHandler(doc, "beforeSelectionChange") || doc.cm && hasHandler(doc.cm, "beforeSelectionChange"))
- { sel = filterSelectionChange(doc, sel, options) }
-
- var bias = options && options.bias ||
- (cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1)
- setSelectionInner(doc, skipAtomicInSelection(doc, sel, bias, true))
-
- if (!(options && options.scroll === false) && doc.cm)
- { ensureCursorVisible(doc.cm) }
-}
-
-function setSelectionInner(doc, sel) {
- if (sel.equals(doc.sel)) { return }
-
- doc.sel = sel
-
- if (doc.cm) {
- doc.cm.curOp.updateInput = doc.cm.curOp.selectionChanged = true
- signalCursorActivity(doc.cm)
- }
- signalLater(doc, "cursorActivity", doc)
-}
-
-// Verify that the selection does not partially select any atomic
-// marked ranges.
-function reCheckSelection(doc) {
- setSelectionInner(doc, skipAtomicInSelection(doc, doc.sel, null, false), sel_dontScroll)
-}
-
-// Return a selection that does not partially select any atomic
-// ranges.
-function skipAtomicInSelection(doc, sel, bias, mayClear) {
- var out
- for (var i = 0; i < sel.ranges.length; i++) {
- var range = sel.ranges[i]
- var old = sel.ranges.length == doc.sel.ranges.length && doc.sel.ranges[i]
- var newAnchor = skipAtomic(doc, range.anchor, old && old.anchor, bias, mayClear)
- var newHead = skipAtomic(doc, range.head, old && old.head, bias, mayClear)
- if (out || newAnchor != range.anchor || newHead != range.head) {
- if (!out) { out = sel.ranges.slice(0, i) }
- out[i] = new Range(newAnchor, newHead)
- }
- }
- return out ? normalizeSelection(out, sel.primIndex) : sel
-}
-
-function skipAtomicInner(doc, pos, oldPos, dir, mayClear) {
- 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))) {
- if (mayClear) {
- signal(m, "beforeCursorEnter")
- if (m.explicitlyCleared) {
- if (!line.markedSpans) { break }
- else {--i; continue}
- }
- }
- if (!m.atomic) { continue }
-
- if (oldPos) {
- var near = m.find(dir < 0 ? 1 : -1), diff = (void 0)
- if (dir < 0 ? m.inclusiveRight : m.inclusiveLeft)
- { 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)
- { far = movePos(doc, far, dir, far.line == pos.line ? line : null) }
- return far ? skipAtomicInner(doc, far, pos, dir, mayClear) : null
- }
- } }
- return pos
-}
-
-// Ensure a given position is not inside an atomic range.
-function skipAtomic(doc, pos, oldPos, bias, mayClear) {
- var dir = bias || 1
- var found = skipAtomicInner(doc, pos, oldPos, dir, mayClear) ||
- (!mayClear && skipAtomicInner(doc, pos, oldPos, dir, true)) ||
- skipAtomicInner(doc, pos, oldPos, -dir, mayClear) ||
- (!mayClear && skipAtomicInner(doc, pos, oldPos, -dir, true))
- if (!found) {
- doc.cantEdit = true
- return Pos(doc.first, 0)
- }
- return found
-}
-
-function movePos(doc, pos, dir, line) {
- if (dir < 0 && pos.ch == 0) {
- if (pos.line > doc.first) { return clipPos(doc, Pos(pos.line - 1)) }
- else { return null }
- } else if (dir > 0 && pos.ch == (line || getLine(doc, pos.line)).text.length) {
- if (pos.line < doc.first + doc.size - 1) { return Pos(pos.line + 1, 0) }
- else { return null }
- } else {
- return new Pos(pos.line, pos.ch + dir)
- }
-}
-
-function selectAll(cm) {
- cm.setSelection(Pos(cm.firstLine(), 0), Pos(cm.lastLine()), sel_dontScroll)
-}
-
-// UPDATING
-
-// Allow "beforeChange" event handlers to influence a change
-function filterChange(doc, change, update) {
- var obj = {
- canceled: false,
- from: change.from,
- to: change.to,
- text: change.text,
- origin: change.origin,
- cancel: function () { return obj.canceled = true; }
- }
- if (update) { obj.update = function (from, to, text, origin) {
- if (from) { obj.from = clipPos(doc, from) }
- if (to) { obj.to = clipPos(doc, to) }
- if (text) { obj.text = text }
- if (origin !== undefined) { obj.origin = origin }
- } }
- signal(doc, "beforeChange", doc, obj)
- if (doc.cm) { signal(doc.cm, "beforeChange", doc.cm, obj) }
-
- if (obj.canceled) { return null }
- return {from: obj.from, to: obj.to, text: obj.text, origin: obj.origin}
-}
-
-// Apply a change to a document, and add it to the document's
-// history, and propagating it to all linked documents.
-function makeChange(doc, change, ignoreReadOnly) {
- if (doc.cm) {
- if (!doc.cm.curOp) { return operation(doc.cm, makeChange)(doc, change, ignoreReadOnly) }
- if (doc.cm.state.suppressEdits) { return }
- }
-
- if (hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange")) {
- change = filterChange(doc, change, true)
- if (!change) { return }
- }
-
- // Possibly split or suppress the update based on the presence
- // of read-only spans in its range.
- var split = sawReadOnlySpans && !ignoreReadOnly && removeReadOnlyRanges(doc, change.from, change.to)
- if (split) {
- for (var i = split.length - 1; i >= 0; --i)
- { makeChangeInner(doc, {from: split[i].from, to: split[i].to, text: i ? [""] : change.text}) }
- } else {
- makeChangeInner(doc, change)
- }
-}
-
-function makeChangeInner(doc, change) {
- if (change.text.length == 1 && change.text[0] == "" && cmp(change.from, change.to) == 0) { return }
- var selAfter = computeSelAfterChange(doc, change)
- addChangeToHistory(doc, change, selAfter, doc.cm ? doc.cm.curOp.id : NaN)
-
- makeChangeSingleDoc(doc, change, selAfter, stretchSpansOverChange(doc, change))
- var rebased = []
-
- linkedDocs(doc, function (doc, sharedHist) {
- if (!sharedHist && indexOf(rebased, doc.history) == -1) {
- rebaseHist(doc.history, change)
- rebased.push(doc.history)
- }
- makeChangeSingleDoc(doc, change, null, stretchSpansOverChange(doc, change))
- })
-}
-
-// Revert a change stored in a document's history.
-function makeChangeFromHistory(doc, type, allowSelectionOnly) {
- if (doc.cm && doc.cm.state.suppressEdits && !allowSelectionOnly) { return }
-
- var hist = doc.history, event, selAfter = doc.sel
- var source = type == "undo" ? hist.done : hist.undone, dest = type == "undo" ? hist.undone : hist.done
-
- // Verify that there is a useable event (so that ctrl-z won't
- // needlessly clear selection events)
- var i = 0
- for (; i < source.length; i++) {
- event = source[i]
- if (allowSelectionOnly ? event.ranges && !event.equals(doc.sel) : !event.ranges)
- { break }
- }
- if (i == source.length) { return }
- hist.lastOrigin = hist.lastSelOrigin = null
-
- for (;;) {
- event = source.pop()
- if (event.ranges) {
- pushSelectionToHistory(event, dest)
- if (allowSelectionOnly && !event.equals(doc.sel)) {
- setSelection(doc, event, {clearRedo: false})
- return
- }
- selAfter = event
- }
- else { break }
- }
-
- // Build up a reverse change object to add to the opposite history
- // stack (redo when undoing, and vice versa).
- var antiChanges = []
- pushSelectionToHistory(selAfter, dest)
- dest.push({changes: antiChanges, generation: hist.generation})
- hist.generation = event.generation || ++hist.maxGeneration
-
- var filter = hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange")
-
- var loop = function ( i ) {
- var change = event.changes[i]
- change.origin = type
- if (filter && !filterChange(doc, change, false)) {
- source.length = 0
- return {}
- }
-
- antiChanges.push(historyChangeFromChange(doc, change))
-
- var after = i ? computeSelAfterChange(doc, change) : lst(source)
- makeChangeSingleDoc(doc, change, after, mergeOldSpans(doc, change))
- if (!i && doc.cm) { doc.cm.scrollIntoView({from: change.from, to: changeEnd(change)}) }
- var rebased = []
-
- // Propagate to the linked documents
- linkedDocs(doc, function (doc, sharedHist) {
- if (!sharedHist && indexOf(rebased, doc.history) == -1) {
- rebaseHist(doc.history, change)
- rebased.push(doc.history)
- }
- makeChangeSingleDoc(doc, change, null, mergeOldSpans(doc, change))
- })
- };
-
- for (var i$1 = event.changes.length - 1; i$1 >= 0; --i$1) {
- var returned = loop( i$1 );
-
- if ( returned ) return returned.v;
- }
-}
-
-// Sub-views need their line numbers shifted when text is added
-// above or below them in the parent document.
-function shiftDoc(doc, distance) {
- if (distance == 0) { return }
- doc.first += distance
- doc.sel = new Selection(map(doc.sel.ranges, function (range) { return new Range(
- Pos(range.anchor.line + distance, range.anchor.ch),
- Pos(range.head.line + distance, range.head.ch)
- ); }), doc.sel.primIndex)
- if (doc.cm) {
- regChange(doc.cm, doc.first, doc.first - distance, distance)
- for (var d = doc.cm.display, l = d.viewFrom; l < d.viewTo; l++)
- { regLineChange(doc.cm, l, "gutter") }
- }
-}
-
-// More lower-level change function, handling only a single document
-// (not linked ones).
-function makeChangeSingleDoc(doc, change, selAfter, spans) {
- if (doc.cm && !doc.cm.curOp)
- { return operation(doc.cm, makeChangeSingleDoc)(doc, change, selAfter, spans) }
-
- if (change.to.line < doc.first) {
- shiftDoc(doc, change.text.length - 1 - (change.to.line - change.from.line))
- return
- }
- if (change.from.line > doc.lastLine()) { return }
-
- // Clip the change to the size of this doc
- if (change.from.line < doc.first) {
- var shift = change.text.length - 1 - (doc.first - change.from.line)
- shiftDoc(doc, shift)
- change = {from: Pos(doc.first, 0), to: Pos(change.to.line + shift, change.to.ch),
- text: [lst(change.text)], origin: change.origin}
- }
- var last = doc.lastLine()
- if (change.to.line > last) {
- change = {from: change.from, to: Pos(last, getLine(doc, last).text.length),
- text: [change.text[0]], origin: change.origin}
- }
-
- change.removed = getBetween(doc, change.from, change.to)
-
- if (!selAfter) { selAfter = computeSelAfterChange(doc, change) }
- if (doc.cm) { makeChangeSingleDocInEditor(doc.cm, change, spans) }
- else { updateDoc(doc, change, spans) }
- setSelectionNoUndo(doc, selAfter, sel_dontScroll)
-}
-
-// Handle the interaction of a change to a document with the editor
-// that this document is part of.
-function makeChangeSingleDocInEditor(cm, change, spans) {
- var doc = cm.doc, display = cm.display, from = change.from, to = change.to
-
- var recomputeMaxLength = false, checkWidthStart = from.line
- if (!cm.options.lineWrapping) {
- checkWidthStart = lineNo(visualLine(getLine(doc, from.line)))
- doc.iter(checkWidthStart, to.line + 1, function (line) {
- if (line == display.maxLine) {
- recomputeMaxLength = true
- return true
- }
- })
- }
-
- if (doc.sel.contains(change.from, change.to) > -1)
- { signalCursorActivity(cm) }
-
- updateDoc(doc, change, spans, estimateHeight(cm))
-
- if (!cm.options.lineWrapping) {
- doc.iter(checkWidthStart, from.line + change.text.length, function (line) {
- var len = lineLength(line)
- if (len > display.maxLineLength) {
- display.maxLine = line
- display.maxLineLength = len
- display.maxLineChanged = true
- recomputeMaxLength = false
- }
- })
- if (recomputeMaxLength) { cm.curOp.updateMaxLine = true }
- }
-
- // Adjust frontier, schedule worker
- doc.frontier = Math.min(doc.frontier, from.line)
- startWorker(cm, 400)
-
- var lendiff = change.text.length - (to.line - from.line) - 1
- // Remember that these lines changed, for updating the display
- if (change.full)
- { regChange(cm) }
- else if (from.line == to.line && change.text.length == 1 && !isWholeLineUpdate(cm.doc, change))
- { regLineChange(cm, from.line, "text") }
- else
- { regChange(cm, from.line, to.line + 1, lendiff) }
-
- var changesHandler = hasHandler(cm, "changes"), changeHandler = hasHandler(cm, "change")
- if (changeHandler || changesHandler) {
- var obj = {
- from: from, to: to,
- text: change.text,
- removed: change.removed,
- origin: change.origin
- }
- if (changeHandler) { signalLater(cm, "change", cm, obj) }
- if (changesHandler) { (cm.curOp.changeObjs || (cm.curOp.changeObjs = [])).push(obj) }
- }
- cm.display.selForContextMenu = null
-}
-
-function replaceRange(doc, code, from, to, origin) {
- if (!to) { to = from }
- if (cmp(to, from) < 0) { var tmp = to; to = from; from = tmp }
- if (typeof code == "string") { code = doc.splitLines(code) }
- makeChange(doc, {from: from, to: to, text: code, origin: origin})
-}
-
-// Rebasing/resetting history to deal with externally-sourced changes
-
-function rebaseHistSelSingle(pos, from, to, diff) {
- if (to < pos.line) {
- pos.line += diff
- } else if (from < pos.line) {
- pos.line = from
- pos.ch = 0
- }
-}
-
-// Tries to rebase an array of history events given a change in the
-// document. If the change touches the same lines as the event, the
-// event, and everything 'behind' it, is discarded. If the change is
-// before the event, the event's positions are updated. Uses a
-// copy-on-write scheme for the positions, to avoid having to
-// reallocate them all on every rebase, but also avoid problems with
-// shared position objects being unsafely updated.
-function rebaseHistArray(array, from, to, diff) {
- for (var i = 0; i < array.length; ++i) {
- var sub = array[i], ok = true
- if (sub.ranges) {
- if (!sub.copied) { sub = array[i] = sub.deepCopy(); sub.copied = true }
- for (var j = 0; j < sub.ranges.length; j++) {
- rebaseHistSelSingle(sub.ranges[j].anchor, from, to, diff)
- rebaseHistSelSingle(sub.ranges[j].head, from, to, diff)
- }
- continue
- }
- for (var j$1 = 0; j$1 < sub.changes.length; ++j$1) {
- var cur = sub.changes[j$1]
- if (to < cur.from.line) {
- cur.from = Pos(cur.from.line + diff, cur.from.ch)
- cur.to = Pos(cur.to.line + diff, cur.to.ch)
- } else if (from <= cur.to.line) {
- ok = false
- break
- }
- }
- if (!ok) {
- array.splice(0, i + 1)
- i = 0
- }
- }
-}
-
-function rebaseHist(hist, change) {
- var from = change.from.line, to = change.to.line, diff = change.text.length - (to - from) - 1
- rebaseHistArray(hist.done, from, to, diff)
- rebaseHistArray(hist.undone, from, to, diff)
-}
-
-// Utility for applying a change to a line by handle or number,
-// returning the number and optionally registering the line as
-// changed.
-function changeLine(doc, handle, changeType, op) {
- var no = handle, line = handle
- if (typeof handle == "number") { line = getLine(doc, clipLine(doc, handle)) }
- else { no = lineNo(handle) }
- if (no == null) { return null }
- if (op(line, no) && doc.cm) { regLineChange(doc.cm, no, changeType) }
- return line
-}
-
-// The document is represented as a BTree consisting of leaves, with
-// chunk of lines in them, and branches, with up to ten leaves or
-// other branch nodes below them. The top node is always a branch
-// node, and is the document object itself (meaning it has
-// additional methods and properties).
-//
-// All nodes have parent links. The tree is used both to go from
-// line numbers to line objects, and to go from objects to numbers.
-// It also indexes by height, and is used to convert between height
-// and line object, and to find the total height of the document.
-//
-// See also http://marijnhaverbeke.nl/blog/codemirror-line-tree.html
-
-function LeafChunk(lines) {
- var this$1 = this;
-
- this.lines = lines
- this.parent = null
- var height = 0
- for (var i = 0; i < lines.length; ++i) {
- lines[i].parent = this$1
- height += lines[i].height
- }
- this.height = height
-}
-
-LeafChunk.prototype = {
- chunkSize: function() { return this.lines.length },
- // Remove the n lines at offset 'at'.
- removeInner: function(at, n) {
- var this$1 = this;
-
- for (var i = at, e = at + n; i < e; ++i) {
- var line = this$1.lines[i]
- this$1.height -= line.height
- cleanUpLine(line)
- signalLater(line, "delete")
- }
- this.lines.splice(at, n)
- },
- // Helper used to collapse a small branch into a single leaf.
- collapse: function(lines) {
- lines.push.apply(lines, this.lines)
- },
- // Insert the given array of lines at offset 'at', count them as
- // having the given height.
- insertInner: function(at, lines, height) {
- var this$1 = this;
-
- this.height += height
- this.lines = this.lines.slice(0, at).concat(lines).concat(this.lines.slice(at))
- for (var i = 0; i < lines.length; ++i) { lines[i].parent = this$1 }
- },
- // Used to iterate over a part of the tree.
- iterN: function(at, n, op) {
- var this$1 = this;
-
- for (var e = at + n; at < e; ++at)
- { if (op(this$1.lines[at])) { return true } }
- }
-}
-
-function BranchChunk(children) {
- var this$1 = this;
-
- this.children = children
- var size = 0, height = 0
- for (var i = 0; i < children.length; ++i) {
- var ch = children[i]
- size += ch.chunkSize(); height += ch.height
- ch.parent = this$1
- }
- this.size = size
- this.height = height
- this.parent = null
-}
-
-BranchChunk.prototype = {
- chunkSize: function() { return this.size },
- removeInner: function(at, n) {
- var this$1 = this;
-
- this.size -= n
- for (var i = 0; i < this.children.length; ++i) {
- var child = this$1.children[i], sz = child.chunkSize()
- if (at < sz) {
- var rm = Math.min(n, sz - at), oldHeight = child.height
- child.removeInner(at, rm)
- this$1.height -= oldHeight - child.height
- if (sz == rm) { this$1.children.splice(i--, 1); child.parent = null }
- if ((n -= rm) == 0) { break }
- at = 0
- } else { at -= sz }
- }
- // If the result is smaller than 25 lines, ensure that it is a
- // single leaf node.
- if (this.size - n < 25 &&
- (this.children.length > 1 || !(this.children[0] instanceof LeafChunk))) {
- var lines = []
- this.collapse(lines)
- this.children = [new LeafChunk(lines)]
- this.children[0].parent = this
- }
- },
- collapse: function(lines) {
- var this$1 = this;
-
- for (var i = 0; i < this.children.length; ++i) { this$1.children[i].collapse(lines) }
- },
- insertInner: function(at, lines, height) {
- var this$1 = this;
-
- this.size += lines.length
- this.height += height
- for (var i = 0; i < this.children.length; ++i) {
- var child = this$1.children[i], sz = child.chunkSize()
- if (at <= sz) {
- child.insertInner(at, lines, height)
- if (child.lines && child.lines.length > 50) {
- // To avoid memory thrashing when child.lines is huge (e.g. first view of a large file), it's never spliced.
- // Instead, small slices are taken. They're taken in order because sequential memory accesses are fastest.
- var remaining = child.lines.length % 25 + 25
- for (var pos = remaining; pos < child.lines.length;) {
- var leaf = new LeafChunk(child.lines.slice(pos, pos += 25))
- child.height -= leaf.height
- this$1.children.splice(++i, 0, leaf)
- leaf.parent = this$1
- }
- child.lines = child.lines.slice(0, remaining)
- this$1.maybeSpill()
- }
- break
- }
- at -= sz
- }
- },
- // When a node has grown, check whether it should be split.
- maybeSpill: function() {
- if (this.children.length <= 10) { return }
- var me = this
- do {
- var spilled = me.children.splice(me.children.length - 5, 5)
- var sibling = new BranchChunk(spilled)
- if (!me.parent) { // Become the parent node
- var copy = new BranchChunk(me.children)
- copy.parent = me
- me.children = [copy, sibling]
- me = copy
- } else {
- me.size -= sibling.size
- me.height -= sibling.height
- var myIndex = indexOf(me.parent.children, me)
- me.parent.children.splice(myIndex + 1, 0, sibling)
- }
- sibling.parent = me.parent
- } while (me.children.length > 10)
- me.parent.maybeSpill()
- },
- iterN: function(at, n, op) {
- var this$1 = this;
-
- for (var i = 0; i < this.children.length; ++i) {
- var child = this$1.children[i], sz = child.chunkSize()
- if (at < sz) {
- var used = Math.min(n, sz - at)
- if (child.iterN(at, used, op)) { return true }
- if ((n -= used) == 0) { break }
- at = 0
- } else { at -= sz }
- }
- }
-}
-
-// Line widgets are block elements displayed above or below a line.
-
-function LineWidget(doc, node, options) {
- var this$1 = this;
-
- if (options) { for (var opt in options) { if (options.hasOwnProperty(opt))
- { this$1[opt] = options[opt] } } }
- this.doc = doc
- this.node = node
-}
-eventMixin(LineWidget)
-
-function adjustScrollWhenAboveVisible(cm, line, diff) {
- if (heightAtLine(line) < ((cm.curOp && cm.curOp.scrollTop) || cm.doc.scrollTop))
- { addToScrollPos(cm, null, diff) }
-}
-
-LineWidget.prototype.clear = function() {
- var this$1 = this;
-
- var cm = this.doc.cm, ws = this.line.widgets, line = this.line, no = lineNo(line)
- if (no == null || !ws) { return }
- for (var i = 0; i < ws.length; ++i) { if (ws[i] == this$1) { ws.splice(i--, 1) } }
- if (!ws.length) { line.widgets = null }
- var height = widgetHeight(this)
- updateLineHeight(line, Math.max(0, line.height - height))
- if (cm) { runInOp(cm, function () {
- adjustScrollWhenAboveVisible(cm, line, -height)
- regLineChange(cm, no, "widget")
- }) }
-}
-LineWidget.prototype.changed = function() {
- var oldH = this.height, cm = this.doc.cm, line = this.line
- this.height = null
- var diff = widgetHeight(this) - oldH
- if (!diff) { return }
- updateLineHeight(line, line.height + diff)
- if (cm) { runInOp(cm, function () {
- cm.curOp.forceUpdate = true
- adjustScrollWhenAboveVisible(cm, line, diff)
- }) }
-}
-
-function addLineWidget(doc, handle, node, options) {
- var widget = new LineWidget(doc, node, options)
- var cm = doc.cm
- if (cm && widget.noHScroll) { cm.display.alignWidgets = true }
- changeLine(doc, handle, "widget", function (line) {
- var widgets = line.widgets || (line.widgets = [])
- if (widget.insertAt == null) { widgets.push(widget) }
- else { widgets.splice(Math.min(widgets.length - 1, Math.max(0, widget.insertAt)), 0, widget) }
- widget.line = line
- if (cm && !lineIsHidden(doc, line)) {
- var aboveVisible = heightAtLine(line) < doc.scrollTop
- updateLineHeight(line, line.height + widgetHeight(widget))
- if (aboveVisible) { addToScrollPos(cm, null, widget.height) }
- cm.curOp.forceUpdate = true
- }
- return true
- })
- return widget
-}
-
-// TEXTMARKERS
-
-// Created with markText and setBookmark methods. A TextMarker is a
-// handle that can be used to clear or find a marked position in the
-// document. Line objects hold arrays (markedSpans) containing
-// {from, to, marker} object pointing to such marker objects, and
-// indicating that such a marker is present on that line. Multiple
-// lines may point to the same marker when it spans across lines.
-// The spans will have null for their from/to properties when the
-// marker continues beyond the start/end of the line. Markers have
-// links back to the lines they currently touch.
-
-// Collapsed markers have unique ids, in order to be able to order
-// them, which is needed for uniquely determining an outer marker
-// when they overlap (they may nest, but not partially overlap).
-var nextMarkerId = 0
-
-function TextMarker(doc, type) {
- this.lines = []
- this.type = type
- this.doc = doc
- this.id = ++nextMarkerId
-}
-eventMixin(TextMarker)
-
-// Clear the marker.
-TextMarker.prototype.clear = function() {
- var this$1 = this;
-
- if (this.explicitlyCleared) { return }
- var cm = this.doc.cm, withOp = cm && !cm.curOp
- if (withOp) { startOperation(cm) }
- if (hasHandler(this, "clear")) {
- var found = this.find()
- if (found) { signalLater(this, "clear", found.from, found.to) }
- }
- var min = null, max = null
- for (var i = 0; i < this.lines.length; ++i) {
- var line = this$1.lines[i]
- var span = getMarkedSpanFor(line.markedSpans, this$1)
- if (cm && !this$1.collapsed) { regLineChange(cm, lineNo(line), "text") }
- else if (cm) {
- if (span.to != null) { max = lineNo(line) }
- if (span.from != null) { min = lineNo(line) }
- }
- line.markedSpans = removeMarkedSpan(line.markedSpans, span)
- if (span.from == null && this$1.collapsed && !lineIsHidden(this$1.doc, line) && cm)
- { updateLineHeight(line, textHeight(cm.display)) }
- }
- if (cm && this.collapsed && !cm.options.lineWrapping) { for (var i$1 = 0; i$1 < this.lines.length; ++i$1) {
- var visual = visualLine(this$1.lines[i$1]), len = lineLength(visual)
- if (len > cm.display.maxLineLength) {
- cm.display.maxLine = visual
- cm.display.maxLineLength = len
- cm.display.maxLineChanged = true
- }
- } }
-
- if (min != null && cm && this.collapsed) { regChange(cm, min, max + 1) }
- this.lines.length = 0
- this.explicitlyCleared = true
- if (this.atomic && this.doc.cantEdit) {
- this.doc.cantEdit = false
- if (cm) { reCheckSelection(cm.doc) }
- }
- if (cm) { signalLater(cm, "markerCleared", cm, this) }
- if (withOp) { endOperation(cm) }
- if (this.parent) { this.parent.clear() }
-}
-
-// Find the position of the marker in the document. Returns a {from,
-// to} object by default. Side can be passed to get a specific side
-// -- 0 (both), -1 (left), or 1 (right). When lineObj is true, the
-// Pos objects returned contain a line object, rather than a line
-// number (used to prevent looking up the same line twice).
-TextMarker.prototype.find = function(side, lineObj) {
- var this$1 = this;
-
- if (side == null && this.type == "bookmark") { side = 1 }
- var from, to
- for (var i = 0; i < this.lines.length; ++i) {
- var line = this$1.lines[i]
- var span = getMarkedSpanFor(line.markedSpans, this$1)
- if (span.from != null) {
- from = Pos(lineObj ? line : lineNo(line), span.from)
- if (side == -1) { return from }
- }
- if (span.to != null) {
- to = Pos(lineObj ? line : lineNo(line), span.to)
- if (side == 1) { return to }
- }
- }
- return from && {from: from, to: to}
-}
-
-// Signals that the marker's widget changed, and surrounding layout
-// should be recomputed.
-TextMarker.prototype.changed = function() {
- var pos = this.find(-1, true), widget = this, cm = this.doc.cm
- if (!pos || !cm) { return }
- runInOp(cm, function () {
- var line = pos.line, lineN = lineNo(pos.line)
- var view = findViewForLine(cm, lineN)
- if (view) {
- clearLineMeasurementCacheFor(view)
- cm.curOp.selectionChanged = cm.curOp.forceUpdate = true
- }
- cm.curOp.updateMaxLine = true
- if (!lineIsHidden(widget.doc, line) && widget.height != null) {
- var oldHeight = widget.height
- widget.height = null
- var dHeight = widgetHeight(widget) - oldHeight
- if (dHeight)
- { updateLineHeight(line, line.height + dHeight) }
- }
- })
-}
-
-TextMarker.prototype.attachLine = function(line) {
- if (!this.lines.length && this.doc.cm) {
- var op = this.doc.cm.curOp
- if (!op.maybeHiddenMarkers || indexOf(op.maybeHiddenMarkers, this) == -1)
- { (op.maybeUnhiddenMarkers || (op.maybeUnhiddenMarkers = [])).push(this) }
- }
- this.lines.push(line)
-}
-TextMarker.prototype.detachLine = function(line) {
- this.lines.splice(indexOf(this.lines, line), 1)
- if (!this.lines.length && this.doc.cm) {
- var op = this.doc.cm.curOp
- ;(op.maybeHiddenMarkers || (op.maybeHiddenMarkers = [])).push(this)
- }
-}
-
-// Create a marker, wire it up to the right lines, and
-function markText(doc, from, to, options, type) {
- // Shared markers (across linked documents) are handled separately
- // (markTextShared will call out to this again, once per
- // document).
- if (options && options.shared) { return markTextShared(doc, from, to, options, type) }
- // Ensure we are in an operation.
- if (doc.cm && !doc.cm.curOp) { return operation(doc.cm, markText)(doc, from, to, options, type) }
-
- var marker = new TextMarker(doc, type), diff = cmp(from, to)
- if (options) { copyObj(options, marker, false) }
- // Don't connect empty markers unless clearWhenEmpty is false
- if (diff > 0 || diff == 0 && marker.clearWhenEmpty !== false)
- { return marker }
- if (marker.replacedWith) {
- // Showing up as a widget implies collapsed (widget replaces text)
- marker.collapsed = true
- marker.widgetNode = elt("span", [marker.replacedWith], "CodeMirror-widget")
- marker.widgetNode.setAttribute("role", "presentation") // hide from accessibility tree
- if (!options.handleMouseEvents) { marker.widgetNode.setAttribute("cm-ignore-events", "true") }
- if (options.insertLeft) { marker.widgetNode.insertLeft = true }
- }
- if (marker.collapsed) {
- if (conflictingCollapsedRange(doc, from.line, from, to, marker) ||
- from.line != to.line && conflictingCollapsedRange(doc, to.line, from, to, marker))
- { throw new Error("Inserting collapsed marker partially overlapping an existing one") }
- seeCollapsedSpans()
- }
-
- if (marker.addToHistory)
- { addChangeToHistory(doc, {from: from, to: to, origin: "markText"}, doc.sel, NaN) }
-
- var curLine = from.line, cm = doc.cm, updateMaxLine
- doc.iter(curLine, to.line + 1, function (line) {
- if (cm && marker.collapsed && !cm.options.lineWrapping && visualLine(line) == cm.display.maxLine)
- { updateMaxLine = true }
- if (marker.collapsed && curLine != from.line) { updateLineHeight(line, 0) }
- addMarkedSpan(line, new MarkedSpan(marker,
- curLine == from.line ? from.ch : null,
- curLine == to.line ? to.ch : null))
- ++curLine
- })
- // lineIsHidden depends on the presence of the spans, so needs a second pass
- if (marker.collapsed) { doc.iter(from.line, to.line + 1, function (line) {
- if (lineIsHidden(doc, line)) { updateLineHeight(line, 0) }
- }) }
-
- if (marker.clearOnEnter) { on(marker, "beforeCursorEnter", function () { return marker.clear(); }) }
-
- if (marker.readOnly) {
- seeReadOnlySpans()
- if (doc.history.done.length || doc.history.undone.length)
- { doc.clearHistory() }
- }
- if (marker.collapsed) {
- marker.id = ++nextMarkerId
- marker.atomic = true
- }
- if (cm) {
- // Sync editor state
- if (updateMaxLine) { cm.curOp.updateMaxLine = true }
- if (marker.collapsed)
- { regChange(cm, from.line, to.line + 1) }
- else if (marker.className || marker.title || marker.startStyle || marker.endStyle || marker.css)
- { for (var i = from.line; i <= to.line; i++) { regLineChange(cm, i, "text") } }
- if (marker.atomic) { reCheckSelection(cm.doc) }
- signalLater(cm, "markerAdded", cm, marker)
- }
- return marker
-}
-
-// SHARED TEXTMARKERS
-
-// A shared marker spans multiple linked documents. It is
-// implemented as a meta-marker-object controlling multiple normal
-// markers.
-function SharedTextMarker(markers, primary) {
- var this$1 = this;
-
- this.markers = markers
- this.primary = primary
- for (var i = 0; i < markers.length; ++i)
- { markers[i].parent = this$1 }
-}
-eventMixin(SharedTextMarker)
-
-SharedTextMarker.prototype.clear = function() {
- var this$1 = this;
-
- if (this.explicitlyCleared) { return }
- this.explicitlyCleared = true
- for (var i = 0; i < this.markers.length; ++i)
- { this$1.markers[i].clear() }
- signalLater(this, "clear")
-}
-SharedTextMarker.prototype.find = function(side, lineObj) {
- return this.primary.find(side, lineObj)
-}
-
-function markTextShared(doc, from, to, options, type) {
- options = copyObj(options)
- options.shared = false
- var markers = [markText(doc, from, to, options, type)], primary = markers[0]
- var widget = options.widgetNode
- linkedDocs(doc, function (doc) {
- if (widget) { options.widgetNode = widget.cloneNode(true) }
- markers.push(markText(doc, clipPos(doc, from), clipPos(doc, to), options, type))
- for (var i = 0; i < doc.linked.length; ++i)
- { if (doc.linked[i].isParent) { return } }
- primary = lst(markers)
- })
- return new SharedTextMarker(markers, primary)
-}
-
-function findSharedMarkers(doc) {
- return doc.findMarks(Pos(doc.first, 0), doc.clipPos(Pos(doc.lastLine())), function (m) { return m.parent; })
-}
-
-function copySharedMarkers(doc, markers) {
- for (var i = 0; i < markers.length; i++) {
- var marker = markers[i], pos = marker.find()
- var mFrom = doc.clipPos(pos.from), mTo = doc.clipPos(pos.to)
- if (cmp(mFrom, mTo)) {
- var subMark = markText(doc, mFrom, mTo, marker.primary, marker.primary.type)
- marker.markers.push(subMark)
- subMark.parent = marker
- }
- }
-}
-
-function detachSharedMarkers(markers) {
- var loop = function ( i ) {
- var marker = markers[i], linked = [marker.primary.doc]
- linkedDocs(marker.primary.doc, function (d) { return linked.push(d); })
- for (var j = 0; j < marker.markers.length; j++) {
- var subMarker = marker.markers[j]
- if (indexOf(linked, subMarker.doc) == -1) {
- subMarker.parent = null
- marker.markers.splice(j--, 1)
- }
- }
- };
-
- for (var i = 0; i < markers.length; i++) loop( i );
-}
-
-var nextDocId = 0
-var Doc = function(text, mode, firstLine, lineSep) {
- if (!(this instanceof Doc)) { return new Doc(text, mode, firstLine, lineSep) }
- if (firstLine == null) { firstLine = 0 }
-
- BranchChunk.call(this, [new LeafChunk([new Line("", null)])])
- this.first = firstLine
- this.scrollTop = this.scrollLeft = 0
- this.cantEdit = false
- this.cleanGeneration = 1
- this.frontier = firstLine
- var start = Pos(firstLine, 0)
- this.sel = simpleSelection(start)
- this.history = new History(null)
- this.id = ++nextDocId
- this.modeOption = mode
- this.lineSep = lineSep
- this.extend = false
-
- if (typeof text == "string") { text = this.splitLines(text) }
- updateDoc(this, {from: start, to: start, text: text})
- setSelection(this, simpleSelection(start), sel_dontScroll)
-}
-
-Doc.prototype = createObj(BranchChunk.prototype, {
- constructor: Doc,
- // Iterate over the document. Supports two forms -- with only one
- // argument, it calls that for each line in the document. With
- // three, it iterates over the range given by the first two (with
- // the second being non-inclusive).
- iter: function(from, to, op) {
- if (op) { this.iterN(from - this.first, to - from, op) }
- else { this.iterN(this.first, this.first + this.size, from) }
- },
-
- // Non-public interface for adding and removing lines.
- insert: function(at, lines) {
- var height = 0
- for (var i = 0; i < lines.length; ++i) { height += lines[i].height }
- this.insertInner(at - this.first, lines, height)
- },
- remove: function(at, n) { this.removeInner(at - this.first, n) },
-
- // From here, the methods are part of the public interface. Most
- // are also available from CodeMirror (editor) instances.
-
- getValue: function(lineSep) {
- var lines = getLines(this, this.first, this.first + this.size)
- if (lineSep === false) { return lines }
- return lines.join(lineSep || this.lineSeparator())
- },
- setValue: docMethodOp(function(code) {
- var top = Pos(this.first, 0), last = this.first + this.size - 1
- makeChange(this, {from: top, to: Pos(last, getLine(this, last).text.length),
- text: this.splitLines(code), origin: "setValue", full: true}, true)
- setSelection(this, simpleSelection(top))
- }),
- replaceRange: function(code, from, to, origin) {
- from = clipPos(this, from)
- to = to ? clipPos(this, to) : from
- replaceRange(this, code, from, to, origin)
- },
- getRange: function(from, to, lineSep) {
- var lines = getBetween(this, clipPos(this, from), clipPos(this, to))
- if (lineSep === false) { return lines }
- return lines.join(lineSep || this.lineSeparator())
- },
-
- getLine: function(line) {var l = this.getLineHandle(line); return l && l.text},
-
- getLineHandle: function(line) {if (isLine(this, line)) { return getLine(this, line) }},
- getLineNumber: function(line) {return lineNo(line)},
-
- getLineHandleVisualStart: function(line) {
- if (typeof line == "number") { line = getLine(this, line) }
- return visualLine(line)
- },
-
- lineCount: function() {return this.size},
- firstLine: function() {return this.first},
- lastLine: function() {return this.first + this.size - 1},
-
- clipPos: function(pos) {return clipPos(this, pos)},
-
- getCursor: function(start) {
- var range = this.sel.primary(), pos
- if (start == null || start == "head") { pos = range.head }
- else if (start == "anchor") { pos = range.anchor }
- else if (start == "end" || start == "to" || start === false) { pos = range.to() }
- else { pos = range.from() }
- return pos
- },
- listSelections: function() { return this.sel.ranges },
- somethingSelected: function() {return this.sel.somethingSelected()},
-
- setCursor: docMethodOp(function(line, ch, options) {
- setSimpleSelection(this, clipPos(this, typeof line == "number" ? Pos(line, ch || 0) : line), null, options)
- }),
- setSelection: docMethodOp(function(anchor, head, options) {
- setSimpleSelection(this, clipPos(this, anchor), clipPos(this, head || anchor), options)
- }),
- extendSelection: docMethodOp(function(head, other, options) {
- extendSelection(this, clipPos(this, head), other && clipPos(this, other), options)
- }),
- extendSelections: docMethodOp(function(heads, options) {
- extendSelections(this, clipPosArray(this, heads), options)
- }),
- extendSelectionsBy: docMethodOp(function(f, options) {
- var heads = map(this.sel.ranges, f)
- extendSelections(this, clipPosArray(this, heads), options)
- }),
- setSelections: docMethodOp(function(ranges, primary, options) {
- var this$1 = this;
-
- if (!ranges.length) { return }
- var out = []
- for (var i = 0; i < ranges.length; i++)
- { out[i] = new Range(clipPos(this$1, ranges[i].anchor),
- clipPos(this$1, ranges[i].head)) }
- if (primary == null) { primary = Math.min(ranges.length - 1, this.sel.primIndex) }
- setSelection(this, normalizeSelection(out, primary), options)
- }),
- addSelection: docMethodOp(function(anchor, head, options) {
- var ranges = this.sel.ranges.slice(0)
- ranges.push(new Range(clipPos(this, anchor), clipPos(this, head || anchor)))
- setSelection(this, normalizeSelection(ranges, ranges.length - 1), options)
- }),
-
- getSelection: function(lineSep) {
- var this$1 = this;
-
- var ranges = this.sel.ranges, lines
- for (var i = 0; i < ranges.length; i++) {
- var sel = getBetween(this$1, ranges[i].from(), ranges[i].to())
- lines = lines ? lines.concat(sel) : sel
- }
- if (lineSep === false) { return lines }
- else { return lines.join(lineSep || this.lineSeparator()) }
- },
- getSelections: function(lineSep) {
- var this$1 = this;
-
- var parts = [], ranges = this.sel.ranges
- for (var i = 0; i < ranges.length; i++) {
- var sel = getBetween(this$1, ranges[i].from(), ranges[i].to())
- if (lineSep !== false) { sel = sel.join(lineSep || this$1.lineSeparator()) }
- parts[i] = sel
- }
- return parts
- },
- replaceSelection: function(code, collapse, origin) {
- var dup = []
- for (var i = 0; i < this.sel.ranges.length; i++)
- { dup[i] = code }
- this.replaceSelections(dup, collapse, origin || "+input")
- },
- replaceSelections: docMethodOp(function(code, collapse, origin) {
- var this$1 = this;
-
- var changes = [], sel = this.sel
- for (var i = 0; i < sel.ranges.length; i++) {
- var range = sel.ranges[i]
- changes[i] = {from: range.from(), to: range.to(), text: this$1.splitLines(code[i]), origin: origin}
- }
- var newSel = collapse && collapse != "end" && computeReplacedSel(this, changes, collapse)
- for (var i$1 = changes.length - 1; i$1 >= 0; i$1--)
- { makeChange(this$1, changes[i$1]) }
- if (newSel) { setSelectionReplaceHistory(this, newSel) }
- else if (this.cm) { ensureCursorVisible(this.cm) }
- }),
- undo: docMethodOp(function() {makeChangeFromHistory(this, "undo")}),
- redo: docMethodOp(function() {makeChangeFromHistory(this, "redo")}),
- undoSelection: docMethodOp(function() {makeChangeFromHistory(this, "undo", true)}),
- redoSelection: docMethodOp(function() {makeChangeFromHistory(this, "redo", true)}),
-
- setExtending: function(val) {this.extend = val},
- getExtending: function() {return this.extend},
-
- historySize: function() {
- var hist = this.history, done = 0, undone = 0
- for (var i = 0; i < hist.done.length; i++) { if (!hist.done[i].ranges) { ++done } }
- 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)},
-
- markClean: function() {
- this.cleanGeneration = this.changeGeneration(true)
- },
- changeGeneration: function(forceSplit) {
- if (forceSplit)
- { this.history.lastOp = this.history.lastSelOp = this.history.lastOrigin = null }
- return this.history.generation
- },
- isClean: function (gen) {
- return this.history.generation == (gen || this.cleanGeneration)
- },
-
- getHistory: function() {
- return {done: copyHistoryArray(this.history.done),
- undone: copyHistoryArray(this.history.undone)}
- },
- setHistory: function(histData) {
- var hist = this.history = new History(this.history.maxGeneration)
- hist.done = copyHistoryArray(histData.done.slice(0), null, true)
- hist.undone = copyHistoryArray(histData.undone.slice(0), null, true)
- },
-
- setGutterMarker: docMethodOp(function(line, gutterID, value) {
- return changeLine(this, line, "gutter", function (line) {
- var markers = line.gutterMarkers || (line.gutterMarkers = {})
- markers[gutterID] = value
- if (!value && isEmpty(markers)) { line.gutterMarkers = null }
- return true
- })
- }),
-
- clearGutter: docMethodOp(function(gutterID) {
- var this$1 = this;
-
- this.iter(function (line) {
- if (line.gutterMarkers && line.gutterMarkers[gutterID]) {
- changeLine(this$1, line, "gutter", function () {
- line.gutterMarkers[gutterID] = null
- if (isEmpty(line.gutterMarkers)) { line.gutterMarkers = null }
- return true
- })
- }
- })
- }),
-
- lineInfo: function(line) {
- var n
- if (typeof line == "number") {
- if (!isLine(this, line)) { return null }
- n = line
- line = getLine(this, line)
- if (!line) { return null }
- } else {
- n = lineNo(line)
- if (n == null) { return null }
- }
- return {line: n, handle: line, text: line.text, gutterMarkers: line.gutterMarkers,
- textClass: line.textClass, bgClass: line.bgClass, wrapClass: line.wrapClass,
- widgets: line.widgets}
- },
-
- addLineClass: docMethodOp(function(handle, where, cls) {
- return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function (line) {
- var prop = where == "text" ? "textClass"
- : where == "background" ? "bgClass"
- : where == "gutter" ? "gutterClass" : "wrapClass"
- if (!line[prop]) { line[prop] = cls }
- else if (classTest(cls).test(line[prop])) { return false }
- else { line[prop] += " " + cls }
- return true
- })
- }),
- removeLineClass: docMethodOp(function(handle, where, cls) {
- return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function (line) {
- var prop = where == "text" ? "textClass"
- : where == "background" ? "bgClass"
- : where == "gutter" ? "gutterClass" : "wrapClass"
- var cur = line[prop]
- if (!cur) { return false }
- else if (cls == null) { line[prop] = null }
- else {
- var found = cur.match(classTest(cls))
- if (!found) { return false }
- var end = found.index + found[0].length
- line[prop] = cur.slice(0, found.index) + (!found.index || end == cur.length ? "" : " ") + cur.slice(end) || null
- }
- return true
- })
- }),
-
- addLineWidget: docMethodOp(function(handle, node, options) {
- return addLineWidget(this, handle, node, options)
- }),
- removeLineWidget: function(widget) { widget.clear() },
-
- markText: function(from, to, options) {
- return markText(this, clipPos(this, from), clipPos(this, to), options, options && options.type || "range")
- },
- setBookmark: function(pos, options) {
- var realOpts = {replacedWith: options && (options.nodeType == null ? options.widget : options),
- insertLeft: options && options.insertLeft,
- clearWhenEmpty: false, shared: options && options.shared,
- handleMouseEvents: options && options.handleMouseEvents}
- pos = clipPos(this, pos)
- return markText(this, pos, pos, realOpts, "bookmark")
- },
- findMarksAt: function(pos) {
- pos = clipPos(this, pos)
- var markers = [], spans = getLine(this, pos.line).markedSpans
- if (spans) { for (var i = 0; i < spans.length; ++i) {
- var span = spans[i]
- if ((span.from == null || span.from <= pos.ch) &&
- (span.to == null || span.to >= pos.ch))
- { markers.push(span.marker.parent || span.marker) }
- } }
- return markers
- },
- findMarks: function(from, to, filter) {
- from = clipPos(this, from); to = clipPos(this, to)
- var found = [], lineNo = from.line
- this.iter(from.line, to.line + 1, function (line) {
- var spans = line.markedSpans
- if (spans) { for (var i = 0; i < spans.length; i++) {
- var span = spans[i]
- if (!(span.to != null && lineNo == from.line && from.ch >= span.to ||
- span.from == null && lineNo != from.line ||
- span.from != null && lineNo == to.line && span.from >= to.ch) &&
- (!filter || filter(span.marker)))
- { found.push(span.marker.parent || span.marker) }
- } }
- ++lineNo
- })
- return found
- },
- getAllMarks: function() {
- var markers = []
- this.iter(function (line) {
- var sps = line.markedSpans
- if (sps) { for (var i = 0; i < sps.length; ++i)
- { if (sps[i].from != null) { markers.push(sps[i].marker) } } }
- })
- return markers
- },
-
- posFromIndex: function(off) {
- var ch, lineNo = this.first, sepSize = this.lineSeparator().length
- this.iter(function (line) {
- var sz = line.text.length + sepSize
- if (sz > off) { ch = off; return true }
- off -= sz
- ++lineNo
- })
- return clipPos(this, Pos(lineNo, ch))
- },
- indexFromPos: function (coords) {
- coords = clipPos(this, coords)
- var index = coords.ch
- if (coords.line < this.first || coords.ch < 0) { return 0 }
- var sepSize = this.lineSeparator().length
- this.iter(this.first, coords.line, function (line) { // iter aborts when callback returns a truthy value
- index += line.text.length + sepSize
- })
- return index
- },
-
- copy: function(copyHistory) {
- var doc = new Doc(getLines(this, this.first, this.first + this.size),
- this.modeOption, this.first, this.lineSep)
- doc.scrollTop = this.scrollTop; doc.scrollLeft = this.scrollLeft
- doc.sel = this.sel
- doc.extend = false
- if (copyHistory) {
- doc.history.undoDepth = this.history.undoDepth
- doc.setHistory(this.getHistory())
- }
- return doc
- },
-
- linkedDoc: function(options) {
- if (!options) { options = {} }
- var from = this.first, to = this.first + this.size
- if (options.from != null && options.from > from) { from = options.from }
- if (options.to != null && options.to < to) { to = options.to }
- var copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from, this.lineSep)
- if (options.sharedHist) { copy.history = this.history
- ; }(this.linked || (this.linked = [])).push({doc: copy, sharedHist: options.sharedHist})
- copy.linked = [{doc: this, isParent: true, sharedHist: options.sharedHist}]
- copySharedMarkers(copy, findSharedMarkers(this))
- return copy
- },
- unlinkDoc: function(other) {
- var this$1 = this;
-
- if (other instanceof CodeMirror) { other = other.doc }
- if (this.linked) { for (var i = 0; i < this.linked.length; ++i) {
- var link = this$1.linked[i]
- if (link.doc != other) { continue }
- this$1.linked.splice(i, 1)
- other.unlinkDoc(this$1)
- detachSharedMarkers(findSharedMarkers(this$1))
- break
- } }
- // If the histories were shared, split them again
- if (other.history == this.history) {
- var splitIds = [other.id]
- linkedDocs(other, function (doc) { return splitIds.push(doc.id); }, true)
- other.history = new History(null)
- other.history.done = copyHistoryArray(this.history.done, splitIds)
- other.history.undone = copyHistoryArray(this.history.undone, splitIds)
- }
- },
- iterLinkedDocs: function(f) {linkedDocs(this, f)},
-
- getMode: function() {return this.mode},
- getEditor: function() {return this.cm},
-
- splitLines: function(str) {
- if (this.lineSep) { return str.split(this.lineSep) }
- return splitLinesAuto(str)
- },
- lineSeparator: function() { return this.lineSep || "\n" }
-})
-
-// Public alias.
-Doc.prototype.eachLine = Doc.prototype.iter
-
-// Kludge to work around strange IE behavior where it'll sometimes
-// re-fire a series of drag-related events right after the drop (#1551)
-var lastDrop = 0
-
-function onDrop(e) {
- var cm = this
- clearDragCursor(cm)
- if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e))
- { return }
- e_preventDefault(e)
- if (ie) { lastDrop = +new Date }
- var pos = posFromMouse(cm, e, true), files = e.dataTransfer.files
- if (!pos || cm.isReadOnly()) { return }
- // Might be a file drop, in which case we simply extract the text
- // 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) {
- pos = clipPos(cm.doc, pos)
- var change = {from: pos, to: pos,
- text: cm.doc.splitLines(text.join(cm.doc.lineSeparator())),
- origin: "paste"}
- makeChange(cm.doc, change)
- setSelectionReplaceHistory(cm.doc, simpleSelection(pos, changeEnd(change)))
- }
- })
- reader.readAsText(file)
- }
- for (var i = 0; i < n; ++i) { loadFile(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) {
- cm.state.draggingText(e)
- // Ensure the editor is re-focused
- setTimeout(function () { return cm.display.input.focus(); }, 20)
- return
- }
- try {
- var text$1 = e.dataTransfer.getData("Text")
- if (text$1) {
- var selected
- if (cm.state.draggingText && !cm.state.draggingText.copy)
- { selected = cm.listSelections() }
- setSelectionNoUndo(cm.doc, simpleSelection(pos, pos))
- if (selected) { for (var i$1 = 0; i$1 < selected.length; ++i$1)
- { replaceRange(cm.doc, "", selected[i$1].anchor, selected[i$1].head, "drag") } }
- cm.replaceSelection(text$1, "around", "paste")
- cm.display.input.focus()
- }
- }
- catch(e){}
- }
-}
-
-function onDragStart(cm, e) {
- if (ie && (!cm.state.draggingText || +new Date - lastDrop < 100)) { e_stop(e); return }
- if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e)) { return }
-
- e.dataTransfer.setData("Text", cm.getSelection())
- e.dataTransfer.effectAllowed = "copyMove"
-
- // Use dummy image instead of default browsers image.
- // Recent Safari (~6.0.2) have a tendency to segfault when this happens, so we don't do it there.
- if (e.dataTransfer.setDragImage && !safari) {
- var img = elt("img", null, null, "position: fixed; left: 0; top: 0;")
- img.src = "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=="
- if (presto) {
- img.width = img.height = 1
- cm.display.wrapper.appendChild(img)
- // Force a relayout, or Opera won't use our image for some obscure reason
- img._top = img.offsetTop
- }
- e.dataTransfer.setDragImage(img, 0, 0)
- if (presto) { img.parentNode.removeChild(img) }
- }
-}
-
-function onDragOver(cm, e) {
- var pos = posFromMouse(cm, e)
- if (!pos) { return }
- var frag = document.createDocumentFragment()
- drawSelectionCursor(cm, pos, frag)
- if (!cm.display.dragCursor) {
- cm.display.dragCursor = elt("div", null, "CodeMirror-cursors CodeMirror-dragcursors")
- cm.display.lineSpace.insertBefore(cm.display.dragCursor, cm.display.cursorDiv)
- }
- removeChildrenAndAdd(cm.display.dragCursor, frag)
-}
-
-function clearDragCursor(cm) {
- if (cm.display.dragCursor) {
- cm.display.lineSpace.removeChild(cm.display.dragCursor)
- cm.display.dragCursor = null
- }
-}
-
-// These must be handled carefully, because naively registering a
-// handler for each editor will cause the editors to never be
-// garbage collected.
-
-function forEachCodeMirror(f) {
- if (!document.body.getElementsByClassName) { return }
- var byClass = document.body.getElementsByClassName("CodeMirror")
- for (var i = 0; i < byClass.length; i++) {
- var cm = byClass[i].CodeMirror
- if (cm) { f(cm) }
- }
-}
-
-var globalsRegistered = false
-function ensureGlobalHandlers() {
- if (globalsRegistered) { return }
- registerGlobalHandlers()
- globalsRegistered = true
-}
-function registerGlobalHandlers() {
- // When the window resizes, we need to refresh active editors.
- var resizeTimer
- on(window, "resize", function () {
- if (resizeTimer == null) { resizeTimer = setTimeout(function () {
- resizeTimer = null
- forEachCodeMirror(onResize)
- }, 100) }
- })
- // When the window loses focus, we want to show the editor as blurred
- on(window, "blur", function () { return forEachCodeMirror(onBlur); })
-}
-// Called when the window resizes
-function onResize(cm) {
- var d = cm.display
- if (d.lastWrapHeight == d.wrapper.clientHeight && d.lastWrapWidth == d.wrapper.clientWidth)
- { return }
- // Might be a text scaling operation, clear size caches.
- d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null
- d.scrollbarsClipped = false
- cm.setSize()
-}
-
-var keyNames = {
- 3: "Enter", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt",
- 19: "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End",
- 36: "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "PrintScrn", 45: "Insert",
- 46: "Delete", 59: ";", 61: "=", 91: "Mod", 92: "Mod", 93: "Mod",
- 106: "*", 107: "=", 109: "-", 110: ".", 111: "/", 127: "Delete",
- 173: "-", 186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\",
- 221: "]", 222: "'", 63232: "Up", 63233: "Down", 63234: "Left", 63235: "Right", 63272: "Delete",
- 63273: "Home", 63275: "End", 63276: "PageUp", 63277: "PageDown", 63302: "Insert"
-}
-
-// Number keys
-for (var i = 0; i < 10; i++) { keyNames[i + 48] = keyNames[i + 96] = String(i) }
-// Alphabetic keys
-for (var i$1 = 65; i$1 <= 90; i$1++) { keyNames[i$1] = String.fromCharCode(i$1) }
-// Function keys
-for (var i$2 = 1; i$2 <= 12; i$2++) { keyNames[i$2 + 111] = keyNames[i$2 + 63235] = "F" + i$2 }
-
-var keyMap = {}
-
-keyMap.basic = {
- "Left": "goCharLeft", "Right": "goCharRight", "Up": "goLineUp", "Down": "goLineDown",
- "End": "goLineEnd", "Home": "goLineStartSmart", "PageUp": "goPageUp", "PageDown": "goPageDown",
- "Delete": "delCharAfter", "Backspace": "delCharBefore", "Shift-Backspace": "delCharBefore",
- "Tab": "defaultTab", "Shift-Tab": "indentAuto",
- "Enter": "newlineAndIndent", "Insert": "toggleOverwrite",
- "Esc": "singleSelection"
-}
-// Note that the save and find-related commands aren't defined by
-// default. User code or addons can define them. Unknown commands
-// are simply ignored.
-keyMap.pcDefault = {
- "Ctrl-A": "selectAll", "Ctrl-D": "deleteLine", "Ctrl-Z": "undo", "Shift-Ctrl-Z": "redo", "Ctrl-Y": "redo",
- "Ctrl-Home": "goDocStart", "Ctrl-End": "goDocEnd", "Ctrl-Up": "goLineUp", "Ctrl-Down": "goLineDown",
- "Ctrl-Left": "goGroupLeft", "Ctrl-Right": "goGroupRight", "Alt-Left": "goLineStart", "Alt-Right": "goLineEnd",
- "Ctrl-Backspace": "delGroupBefore", "Ctrl-Delete": "delGroupAfter", "Ctrl-S": "save", "Ctrl-F": "find",
- "Ctrl-G": "findNext", "Shift-Ctrl-G": "findPrev", "Shift-Ctrl-F": "replace", "Shift-Ctrl-R": "replaceAll",
- "Ctrl-[": "indentLess", "Ctrl-]": "indentMore",
- "Ctrl-U": "undoSelection", "Shift-Ctrl-U": "redoSelection", "Alt-U": "redoSelection",
- fallthrough: "basic"
-}
-// Very basic readline/emacs-style bindings, which are standard on Mac.
-keyMap.emacsy = {
- "Ctrl-F": "goCharRight", "Ctrl-B": "goCharLeft", "Ctrl-P": "goLineUp", "Ctrl-N": "goLineDown",
- "Alt-F": "goWordRight", "Alt-B": "goWordLeft", "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd",
- "Ctrl-V": "goPageDown", "Shift-Ctrl-V": "goPageUp", "Ctrl-D": "delCharAfter", "Ctrl-H": "delCharBefore",
- "Alt-D": "delWordAfter", "Alt-Backspace": "delWordBefore", "Ctrl-K": "killLine", "Ctrl-T": "transposeChars",
- "Ctrl-O": "openLine"
-}
-keyMap.macDefault = {
- "Cmd-A": "selectAll", "Cmd-D": "deleteLine", "Cmd-Z": "undo", "Shift-Cmd-Z": "redo", "Cmd-Y": "redo",
- "Cmd-Home": "goDocStart", "Cmd-Up": "goDocStart", "Cmd-End": "goDocEnd", "Cmd-Down": "goDocEnd", "Alt-Left": "goGroupLeft",
- "Alt-Right": "goGroupRight", "Cmd-Left": "goLineLeft", "Cmd-Right": "goLineRight", "Alt-Backspace": "delGroupBefore",
- "Ctrl-Alt-Backspace": "delGroupAfter", "Alt-Delete": "delGroupAfter", "Cmd-S": "save", "Cmd-F": "find",
- "Cmd-G": "findNext", "Shift-Cmd-G": "findPrev", "Cmd-Alt-F": "replace", "Shift-Cmd-Alt-F": "replaceAll",
- "Cmd-[": "indentLess", "Cmd-]": "indentMore", "Cmd-Backspace": "delWrappedLineLeft", "Cmd-Delete": "delWrappedLineRight",
- "Cmd-U": "undoSelection", "Shift-Cmd-U": "redoSelection", "Ctrl-Up": "goDocStart", "Ctrl-Down": "goDocEnd",
- fallthrough: ["basic", "emacsy"]
-}
-keyMap["default"] = mac ? keyMap.macDefault : keyMap.pcDefault
-
-// KEYMAP DISPATCH
-
-function normalizeKeyName(name) {
- var parts = name.split(/-(?!$)/)
- name = parts[parts.length - 1]
- var alt, ctrl, shift, cmd
- for (var i = 0; i < parts.length - 1; i++) {
- var mod = parts[i]
- if (/^(cmd|meta|m)$/i.test(mod)) { cmd = true }
- else if (/^a(lt)?$/i.test(mod)) { alt = true }
- else if (/^(c|ctrl|control)$/i.test(mod)) { ctrl = true }
- else if (/^s(hift)?$/i.test(mod)) { shift = true }
- else { throw new Error("Unrecognized modifier name: " + mod) }
- }
- if (alt) { name = "Alt-" + name }
- if (ctrl) { name = "Ctrl-" + name }
- if (cmd) { name = "Cmd-" + name }
- if (shift) { name = "Shift-" + name }
- return name
-}
-
-// This is a kludge to keep keymaps mostly working as raw objects
-// (backwards compatibility) while at the same time support features
-// like normalization and multi-stroke key bindings. It compiles a
-// new normalized keymap, and then updates the old object to reflect
-// this.
-function normalizeKeyMap(keymap) {
- var copy = {}
- for (var keyname in keymap) { if (keymap.hasOwnProperty(keyname)) {
- var value = keymap[keyname]
- if (/^(name|fallthrough|(de|at)tach)$/.test(keyname)) { continue }
- if (value == "...") { delete keymap[keyname]; continue }
-
- var keys = map(keyname.split(" "), normalizeKeyName)
- for (var i = 0; i < keys.length; i++) {
- var val = (void 0), name = (void 0)
- if (i == keys.length - 1) {
- name = keys.join(" ")
- val = value
- } else {
- name = keys.slice(0, i + 1).join(" ")
- val = "..."
- }
- var prev = copy[name]
- if (!prev) { copy[name] = val }
- else if (prev != val) { throw new Error("Inconsistent bindings for " + name) }
- }
- delete keymap[keyname]
- } }
- for (var prop in copy) { keymap[prop] = copy[prop] }
- return keymap
-}
-
-function lookupKey(key, map, handle, context) {
- map = getKeyMap(map)
- var found = map.call ? map.call(key, context) : map[key]
- if (found === false) { return "nothing" }
- if (found === "...") { return "multi" }
- if (found != null && handle(found)) { return "handled" }
-
- if (map.fallthrough) {
- if (Object.prototype.toString.call(map.fallthrough) != "[object Array]")
- { return lookupKey(key, map.fallthrough, handle, context) }
- for (var i = 0; i < map.fallthrough.length; i++) {
- var result = lookupKey(key, map.fallthrough[i], handle, context)
- if (result) { return result }
- }
- }
-}
-
-// Modifier key presses don't count as 'real' key presses for the
-// purpose of keymap fallthrough.
-function isModifierKey(value) {
- var name = typeof value == "string" ? value : keyNames[value.keyCode]
- return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod"
-}
-
-// Look up the name of a key as indicated by an event object.
-function keyName(event, noShift) {
- if (presto && event.keyCode == 34 && event["char"]) { return false }
- var base = keyNames[event.keyCode], name = base
- if (name == null || event.altGraphKey) { return false }
- if (event.altKey && base != "Alt") { name = "Alt-" + name }
- if ((flipCtrlCmd ? event.metaKey : event.ctrlKey) && base != "Ctrl") { name = "Ctrl-" + name }
- if ((flipCtrlCmd ? event.ctrlKey : event.metaKey) && base != "Cmd") { name = "Cmd-" + name }
- if (!noShift && event.shiftKey && base != "Shift") { name = "Shift-" + name }
- return name
-}
-
-function getKeyMap(val) {
- return typeof val == "string" ? keyMap[val] : val
-}
-
-// Helper for deleting text near the selection(s), used to implement
-// backspace, delete, and similar functionality.
-function deleteNearSelection(cm, compute) {
- var ranges = cm.doc.sel.ranges, kill = []
- // Build up a set of ranges to kill first, merging overlapping
- // ranges.
- for (var i = 0; i < ranges.length; i++) {
- var toKill = compute(ranges[i])
- while (kill.length && cmp(toKill.from, lst(kill).to) <= 0) {
- var replaced = kill.pop()
- if (cmp(replaced.from, toKill.from) < 0) {
- toKill.from = replaced.from
- break
- }
- }
- kill.push(toKill)
- }
- // Next, remove those actual ranges.
- runInOp(cm, function () {
- for (var i = kill.length - 1; i >= 0; i--)
- { replaceRange(cm.doc, "", kill[i].from, kill[i].to, "+delete") }
- ensureCursorVisible(cm)
- })
-}
-
-// Commands are parameter-less actions that can be performed on an
-// editor, mostly used for keybindings.
-var commands = {
- selectAll: selectAll,
- singleSelection: function (cm) { return cm.setSelection(cm.getCursor("anchor"), cm.getCursor("head"), sel_dontScroll); },
- killLine: function (cm) { return deleteNearSelection(cm, function (range) {
- if (range.empty()) {
- var len = getLine(cm.doc, range.head.line).text.length
- if (range.head.ch == len && range.head.line < cm.lastLine())
- { return {from: range.head, to: Pos(range.head.line + 1, 0)} }
- else
- { return {from: range.head, to: Pos(range.head.line, len)} }
- } else {
- return {from: range.from(), to: range.to()}
- }
- }); },
- deleteLine: function (cm) { return deleteNearSelection(cm, function (range) { return ({
- from: Pos(range.from().line, 0),
- to: clipPos(cm.doc, Pos(range.to().line + 1, 0))
- }); }); },
- delLineLeft: function (cm) { return deleteNearSelection(cm, function (range) { return ({
- from: Pos(range.from().line, 0), to: range.from()
- }); }); },
- delWrappedLineLeft: function (cm) { return deleteNearSelection(cm, function (range) {
- var top = cm.charCoords(range.head, "div").top + 5
- var leftPos = cm.coordsChar({left: 0, top: top}, "div")
- return {from: leftPos, to: range.from()}
- }); },
- delWrappedLineRight: function (cm) { return deleteNearSelection(cm, function (range) {
- var top = cm.charCoords(range.head, "div").top + 5
- var rightPos = cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div")
- return {from: range.from(), to: rightPos }
- }); },
- undo: function (cm) { return cm.undo(); },
- redo: function (cm) { return cm.redo(); },
- undoSelection: function (cm) { return cm.undoSelection(); },
- redoSelection: function (cm) { return cm.redoSelection(); },
- goDocStart: function (cm) { return cm.extendSelection(Pos(cm.firstLine(), 0)); },
- goDocEnd: function (cm) { return cm.extendSelection(Pos(cm.lastLine())); },
- goLineStart: function (cm) { return cm.extendSelectionsBy(function (range) { return lineStart(cm, range.head.line); },
- {origin: "+move", bias: 1}
- ); },
- goLineStartSmart: function (cm) { return cm.extendSelectionsBy(function (range) { return lineStartSmart(cm, range.head); },
- {origin: "+move", bias: 1}
- ); },
- goLineEnd: function (cm) { return cm.extendSelectionsBy(function (range) { return lineEnd(cm, range.head.line); },
- {origin: "+move", bias: -1}
- ); },
- goLineRight: function (cm) { return cm.extendSelectionsBy(function (range) {
- var top = cm.charCoords(range.head, "div").top + 5
- return cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div")
- }, sel_move); },
- goLineLeft: function (cm) { return cm.extendSelectionsBy(function (range) {
- var top = cm.charCoords(range.head, "div").top + 5
- return cm.coordsChar({left: 0, top: top}, "div")
- }, sel_move); },
- goLineLeftSmart: function (cm) { return cm.extendSelectionsBy(function (range) {
- var top = cm.charCoords(range.head, "div").top + 5
- var pos = cm.coordsChar({left: 0, top: top}, "div")
- if (pos.ch < cm.getLine(pos.line).search(/\S/)) { return lineStartSmart(cm, range.head) }
- return pos
- }, sel_move); },
- goLineUp: function (cm) { return cm.moveV(-1, "line"); },
- goLineDown: function (cm) { return cm.moveV(1, "line"); },
- goPageUp: function (cm) { return cm.moveV(-1, "page"); },
- goPageDown: function (cm) { return cm.moveV(1, "page"); },
- goCharLeft: function (cm) { return cm.moveH(-1, "char"); },
- goCharRight: function (cm) { return cm.moveH(1, "char"); },
- goColumnLeft: function (cm) { return cm.moveH(-1, "column"); },
- goColumnRight: function (cm) { return cm.moveH(1, "column"); },
- goWordLeft: function (cm) { return cm.moveH(-1, "word"); },
- goGroupRight: function (cm) { return cm.moveH(1, "group"); },
- goGroupLeft: function (cm) { return cm.moveH(-1, "group"); },
- goWordRight: function (cm) { return cm.moveH(1, "word"); },
- delCharBefore: function (cm) { return cm.deleteH(-1, "char"); },
- delCharAfter: function (cm) { return cm.deleteH(1, "char"); },
- delWordBefore: function (cm) { return cm.deleteH(-1, "word"); },
- delWordAfter: function (cm) { return cm.deleteH(1, "word"); },
- delGroupBefore: function (cm) { return cm.deleteH(-1, "group"); },
- delGroupAfter: function (cm) { return cm.deleteH(1, "group"); },
- indentAuto: function (cm) { return cm.indentSelection("smart"); },
- indentMore: function (cm) { return cm.indentSelection("add"); },
- indentLess: function (cm) { return cm.indentSelection("subtract"); },
- insertTab: function (cm) { return cm.replaceSelection("\t"); },
- insertSoftTab: function (cm) {
- var spaces = [], ranges = cm.listSelections(), tabSize = cm.options.tabSize
- for (var i = 0; i < ranges.length; i++) {
- var pos = ranges[i].from()
- var col = countColumn(cm.getLine(pos.line), pos.ch, tabSize)
- spaces.push(spaceStr(tabSize - col % tabSize))
- }
- cm.replaceSelections(spaces)
- },
- defaultTab: function (cm) {
- if (cm.somethingSelected()) { cm.indentSelection("add") }
- else { cm.execCommand("insertTab") }
- },
- // Swap the two chars left and right of each selection's head.
- // Move cursor behind the two swapped characters afterwards.
- //
- // Doesn't consider line feeds a character.
- // Doesn't scan more than one line above to find a character.
- // Doesn't do anything on an empty line.
- // Doesn't do anything with non-empty selections.
- transposeChars: function (cm) { return runInOp(cm, function () {
- var ranges = cm.listSelections(), newSel = []
- for (var i = 0; i < ranges.length; i++) {
- if (!ranges[i].empty()) { continue }
- var cur = ranges[i].head, line = getLine(cm.doc, cur.line).text
- if (line) {
- if (cur.ch == line.length) { cur = new Pos(cur.line, cur.ch - 1) }
- if (cur.ch > 0) {
- cur = new Pos(cur.line, cur.ch + 1)
- cm.replaceRange(line.charAt(cur.ch - 1) + line.charAt(cur.ch - 2),
- Pos(cur.line, cur.ch - 2), cur, "+transpose")
- } else if (cur.line > cm.doc.first) {
- var prev = getLine(cm.doc, cur.line - 1).text
- if (prev) {
- cur = new Pos(cur.line, 1)
- cm.replaceRange(line.charAt(0) + cm.doc.lineSeparator() +
- prev.charAt(prev.length - 1),
- Pos(cur.line - 1, prev.length - 1), cur, "+transpose")
- }
- }
- }
- newSel.push(new Range(cur, cur))
- }
- cm.setSelections(newSel)
- }); },
- newlineAndIndent: function (cm) { return runInOp(cm, function () {
- var sels = cm.listSelections()
- for (var i = sels.length - 1; i >= 0; i--)
- { cm.replaceRange(cm.doc.lineSeparator(), sels[i].anchor, sels[i].head, "+input") }
- sels = cm.listSelections()
- for (var i$1 = 0; i$1 < sels.length; i$1++)
- { cm.indentLine(sels[i$1].from().line, null, true) }
- ensureCursorVisible(cm)
- }); },
- openLine: function (cm) { return cm.replaceSelection("\n", "start"); },
- toggleOverwrite: function (cm) { return cm.toggleOverwrite(); }
-}
-
-
-function lineStart(cm, lineN) {
- var line = getLine(cm.doc, lineN)
- var visual = visualLine(line)
- if (visual != line) { lineN = lineNo(visual) }
- var order = getOrder(visual)
- var ch = !order ? 0 : order[0].level % 2 ? lineRight(visual) : lineLeft(visual)
- return Pos(lineN, ch)
-}
-function lineEnd(cm, lineN) {
- var merged, line = getLine(cm.doc, lineN)
- while (merged = collapsedSpanAtEnd(line)) {
- line = merged.find(1, true).line
- lineN = null
- }
- var order = getOrder(line)
- var ch = !order ? line.text.length : order[0].level % 2 ? lineLeft(line) : lineRight(line)
- return Pos(lineN == null ? lineNo(line) : lineN, ch)
-}
-function lineStartSmart(cm, pos) {
- var start = lineStart(cm, pos.line)
- var line = getLine(cm.doc, start.line)
- var order = getOrder(line)
- if (!order || order[0].level == 0) {
- var firstNonWS = Math.max(0, line.text.search(/\S/))
- var inWS = pos.line == start.line && pos.ch <= firstNonWS && pos.ch
- return Pos(start.line, inWS ? 0 : firstNonWS)
- }
- return start
-}
-
-// Run a handler that was bound to a key.
-function doHandleBinding(cm, bound, dropShift) {
- if (typeof bound == "string") {
- bound = commands[bound]
- if (!bound) { return false }
- }
- // Ensure previous input has been read, so that the handler sees a
- // consistent view of the document
- cm.display.input.ensurePolled()
- var prevShift = cm.display.shift, done = false
- try {
- if (cm.isReadOnly()) { cm.state.suppressEdits = true }
- if (dropShift) { cm.display.shift = false }
- done = bound(cm) != Pass
- } finally {
- cm.display.shift = prevShift
- cm.state.suppressEdits = false
- }
- return done
-}
-
-function lookupKeyForEditor(cm, name, handle) {
- for (var i = 0; i < cm.state.keyMaps.length; i++) {
- var result = lookupKey(name, cm.state.keyMaps[i], handle, cm)
- if (result) { return result }
- }
- return (cm.options.extraKeys && lookupKey(name, cm.options.extraKeys, handle, cm))
- || lookupKey(name, cm.options.keyMap, handle, cm)
-}
-
-var stopSeq = new Delayed
-function dispatchKey(cm, name, e, handle) {
- var seq = cm.state.keySeq
- if (seq) {
- if (isModifierKey(name)) { return "handled" }
- stopSeq.set(50, function () {
- if (cm.state.keySeq == seq) {
- cm.state.keySeq = null
- cm.display.input.reset()
- }
- })
- name = seq + " " + name
- }
- var result = lookupKeyForEditor(cm, name, handle)
-
- if (result == "multi")
- { cm.state.keySeq = name }
- if (result == "handled")
- { signalLater(cm, "keyHandled", cm, name, e) }
-
- if (result == "handled" || result == "multi") {
- e_preventDefault(e)
- restartBlink(cm)
- }
-
- if (seq && !result && /\'$/.test(name)) {
- e_preventDefault(e)
- return true
- }
- return !!result
-}
-
-// Handle a key from the keydown event.
-function handleKeyBinding(cm, e) {
- var name = keyName(e, true)
- if (!name) { return false }
-
- if (e.shiftKey && !cm.state.keySeq) {
- // First try to resolve full name (including 'Shift-'). Failing
- // that, see if there is a cursor-motion command (starting with
- // 'go') bound to the keyname without 'Shift-'.
- return dispatchKey(cm, "Shift-" + name, e, function (b) { return doHandleBinding(cm, b, true); })
- || dispatchKey(cm, name, e, function (b) {
- if (typeof b == "string" ? /^go[A-Z]/.test(b) : b.motion)
- { return doHandleBinding(cm, b) }
- })
- } else {
- return dispatchKey(cm, name, e, function (b) { return doHandleBinding(cm, b); })
- }
-}
-
-// Handle a key from the keypress event
-function handleCharBinding(cm, e, ch) {
- return dispatchKey(cm, "'" + ch + "'", e, function (b) { return doHandleBinding(cm, b, true); })
-}
-
-var lastStoppedKey = null
-function onKeyDown(e) {
- var cm = this
- cm.curOp.focus = activeElt()
- if (signalDOMEvent(cm, e)) { return }
- // IE does strange things with escape.
- if (ie && ie_version < 11 && e.keyCode == 27) { e.returnValue = false }
- var code = e.keyCode
- cm.display.shift = code == 16 || e.shiftKey
- var handled = handleKeyBinding(cm, e)
- if (presto) {
- lastStoppedKey = handled ? code : null
- // Opera has no cut event... we try to at least catch the key combo
- if (!handled && code == 88 && !hasCopyEvent && (mac ? e.metaKey : e.ctrlKey))
- { cm.replaceSelection("", null, "cut") }
- }
-
- // Turn mouse into crosshair when Alt is held on Mac.
- if (code == 18 && !/\bCodeMirror-crosshair\b/.test(cm.display.lineDiv.className))
- { showCrossHair(cm) }
-}
-
-function showCrossHair(cm) {
- var lineDiv = cm.display.lineDiv
- addClass(lineDiv, "CodeMirror-crosshair")
-
- function up(e) {
- if (e.keyCode == 18 || !e.altKey) {
- rmClass(lineDiv, "CodeMirror-crosshair")
- off(document, "keyup", up)
- off(document, "mouseover", up)
- }
- }
- on(document, "keyup", up)
- on(document, "mouseover", up)
-}
-
-function onKeyUp(e) {
- if (e.keyCode == 16) { this.doc.sel.shift = false }
- signalDOMEvent(this, e)
-}
-
-function onKeyPress(e) {
- var cm = this
- 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}
- if ((presto && (!e.which || e.which < 10)) && handleKeyBinding(cm, e)) { return }
- var ch = String.fromCharCode(charCode == null ? keyCode : charCode)
- // Some browsers fire keypress events for backspace
- if (ch == "\x08") { return }
- if (handleCharBinding(cm, e, ch)) { return }
- cm.display.input.onKeyPress(e)
-}
-
-// A mouse down can be a single click, double click, triple click,
-// start of selection drag, start of text drag, new cursor
-// (ctrl-click), rectangle drag (alt-drag), or xwin
-// middle-click-paste. Or it might be a click on something we should
-// not interfere with, such as a scrollbar or widget.
-function onMouseDown(e) {
- var cm = this, display = cm.display
- if (signalDOMEvent(cm, e) || display.activeTouch && display.input.supportsTouch()) { return }
- display.input.ensurePolled()
- display.shift = e.shiftKey
-
- if (eventInWidget(display, e)) {
- if (!webkit) {
- // Briefly turn off draggability, to allow widgets to do
- // normal dragging things.
- display.scroller.draggable = false
- setTimeout(function () { return display.scroller.draggable = true; }, 100)
- }
- return
- }
- if (clickInGutter(cm, e)) { return }
- var start = posFromMouse(cm, e)
- window.focus()
-
- switch (e_button(e)) {
- case 1:
- // #3261: make sure, that we're not starting a second selection
- if (cm.state.selectingText)
- { cm.state.selectingText(e) }
- else if (start)
- { leftButtonDown(cm, e, start) }
- else if (e_target(e) == display.scroller)
- { e_preventDefault(e) }
- break
- case 2:
- if (webkit) { cm.state.lastMiddleDown = +new Date }
- if (start) { extendSelection(cm.doc, start) }
- setTimeout(function () { return display.input.focus(); }, 20)
- e_preventDefault(e)
- break
- case 3:
- if (captureRightClick) { onContextMenu(cm, e) }
- else { delayBlurEvent(cm) }
- break
- }
-}
-
-var lastClick;
-var lastDoubleClick;
-function leftButtonDown(cm, e, start) {
- if (ie) { setTimeout(bind(ensureFocus, cm), 0) }
- else { cm.curOp.focus = activeElt() }
-
- var now = +new Date, type
- if (lastDoubleClick && lastDoubleClick.time > now - 400 && cmp(lastDoubleClick.pos, start) == 0) {
- type = "triple"
- } else if (lastClick && lastClick.time > now - 400 && cmp(lastClick.pos, start) == 0) {
- type = "double"
- lastDoubleClick = {time: now, pos: start}
- } else {
- type = "single"
- lastClick = {time: now, pos: start}
- }
-
- var sel = cm.doc.sel, modifier = mac ? e.metaKey : e.ctrlKey, contained
- if (cm.options.dragDrop && dragAndDrop && !cm.isReadOnly() &&
- type == "single" && (contained = sel.contains(start)) > -1 &&
- (cmp((contained = sel.ranges[contained]).from(), start) < 0 || start.xRel > 0) &&
- (cmp(contained.to(), start) > 0 || start.xRel < 0))
- { leftButtonStartDrag(cm, e, start, modifier) }
- else
- { leftButtonSelect(cm, e, start, type, modifier) }
-}
-
-// Start a text drag. When it ends, see if any dragging actually
-// happen, and treat as a click if it didn't.
-function leftButtonStartDrag(cm, e, start, modifier) {
- var display = cm.display, startTime = +new Date
- var dragEnd = operation(cm, function (e2) {
- if (webkit) { display.scroller.draggable = false }
- cm.state.draggingText = false
- off(document, "mouseup", dragEnd)
- off(display.scroller, "drop", dragEnd)
- if (Math.abs(e.clientX - e2.clientX) + Math.abs(e.clientY - e2.clientY) < 10) {
- e_preventDefault(e2)
- if (!modifier && +new Date - 200 < startTime)
- { extendSelection(cm.doc, start) }
- // Work around unexplainable focus problem in IE9 (#2127) and Chrome (#3081)
- if (webkit || ie && ie_version == 9)
- { setTimeout(function () {document.body.focus(); display.input.focus()}, 20) }
- else
- { display.input.focus() }
- }
- })
- // Let the drag handler handle this.
- if (webkit) { display.scroller.draggable = true }
- cm.state.draggingText = dragEnd
- dragEnd.copy = mac ? e.altKey : e.ctrlKey
- // IE's approach to draggable
- if (display.scroller.dragDrop) { display.scroller.dragDrop() }
- on(document, "mouseup", dragEnd)
- on(display.scroller, "drop", dragEnd)
-}
-
-// Normal selection, as opposed to text dragging.
-function leftButtonSelect(cm, e, start, type, addNew) {
- var display = cm.display, doc = cm.doc
- e_preventDefault(e)
-
- var ourRange, ourIndex, startSel = doc.sel, ranges = startSel.ranges
- if (addNew && !e.shiftKey) {
- ourIndex = doc.sel.contains(start)
- if (ourIndex > -1)
- { ourRange = ranges[ourIndex] }
- else
- { ourRange = new Range(start, start) }
- } else {
- ourRange = doc.sel.primary()
- ourIndex = doc.sel.primIndex
- }
-
- if (chromeOS ? e.shiftKey && e.metaKey : e.altKey) {
- type = "rect"
- if (!addNew) { ourRange = new Range(start, start) }
- start = posFromMouse(cm, e, true, true)
- ourIndex = -1
- } else if (type == "double") {
- var word = cm.findWordAt(start)
- if (cm.display.shift || doc.extend)
- { ourRange = extendRange(doc, ourRange, word.anchor, word.head) }
- else
- { ourRange = word }
- } else if (type == "triple") {
- var line = new Range(Pos(start.line, 0), clipPos(doc, Pos(start.line + 1, 0)))
- if (cm.display.shift || doc.extend)
- { ourRange = extendRange(doc, ourRange, line.anchor, line.head) }
- else
- { ourRange = line }
- } else {
- ourRange = extendRange(doc, ourRange, start)
- }
-
- if (!addNew) {
- ourIndex = 0
- setSelection(doc, new Selection([ourRange], 0), sel_mouse)
- startSel = doc.sel
- } else if (ourIndex == -1) {
- ourIndex = ranges.length
- setSelection(doc, normalizeSelection(ranges.concat([ourRange]), ourIndex),
- {scroll: false, origin: "*mouse"})
- } else if (ranges.length > 1 && ranges[ourIndex].empty() && type == "single" && !e.shiftKey) {
- setSelection(doc, normalizeSelection(ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0),
- {scroll: false, origin: "*mouse"})
- startSel = doc.sel
- } else {
- replaceOneSelection(doc, ourIndex, ourRange, sel_mouse)
- }
-
- var lastPos = start
- function extendTo(pos) {
- if (cmp(lastPos, pos) == 0) { return }
- lastPos = pos
-
- if (type == "rect") {
- var ranges = [], tabSize = cm.options.tabSize
- var startCol = countColumn(getLine(doc, start.line).text, start.ch, tabSize)
- var posCol = countColumn(getLine(doc, pos.line).text, pos.ch, tabSize)
- var left = Math.min(startCol, posCol), right = Math.max(startCol, posCol)
- for (var line = Math.min(start.line, pos.line), end = Math.min(cm.lastLine(), Math.max(start.line, pos.line));
- line <= end; line++) {
- var text = getLine(doc, line).text, leftPos = findColumn(text, left, tabSize)
- if (left == right)
- { ranges.push(new Range(Pos(line, leftPos), Pos(line, leftPos))) }
- else if (text.length > leftPos)
- { ranges.push(new Range(Pos(line, leftPos), Pos(line, findColumn(text, right, tabSize)))) }
- }
- if (!ranges.length) { ranges.push(new Range(start, start)) }
- setSelection(doc, normalizeSelection(startSel.ranges.slice(0, ourIndex).concat(ranges), ourIndex),
- {origin: "*mouse", scroll: false})
- cm.scrollIntoView(pos)
- } else {
- var oldRange = ourRange
- var anchor = oldRange.anchor, head = pos
- if (type != "single") {
- var range
- if (type == "double")
- { range = cm.findWordAt(pos) }
- else
- { range = new Range(Pos(pos.line, 0), clipPos(doc, Pos(pos.line + 1, 0))) }
- if (cmp(range.anchor, anchor) > 0) {
- head = range.head
- anchor = minPos(oldRange.from(), range.anchor)
- } else {
- head = range.anchor
- anchor = maxPos(oldRange.to(), range.head)
- }
- }
- var ranges$1 = startSel.ranges.slice(0)
- ranges$1[ourIndex] = new Range(clipPos(doc, anchor), head)
- setSelection(doc, normalizeSelection(ranges$1, ourIndex), sel_mouse)
- }
- }
-
- var editorSize = display.wrapper.getBoundingClientRect()
- // Used to ensure timeout re-tries don't fire when another extend
- // happened in the meantime (clearTimeout isn't reliable -- at
- // least on Chrome, the timeouts still happen even when cleared,
- // if the clear happens after their scheduled firing time).
- var counter = 0
-
- function extend(e) {
- var curCount = ++counter
- var cur = posFromMouse(cm, e, true, type == "rect")
- if (!cur) { return }
- if (cmp(cur, lastPos) != 0) {
- cm.curOp.focus = activeElt()
- extendTo(cur)
- var visible = visibleLines(display, doc)
- if (cur.line >= visible.to || cur.line < visible.from)
- { setTimeout(operation(cm, function () {if (counter == curCount) { extend(e) }}), 150) }
- } else {
- var outside = e.clientY < editorSize.top ? -20 : e.clientY > editorSize.bottom ? 20 : 0
- if (outside) { setTimeout(operation(cm, function () {
- if (counter != curCount) { return }
- display.scroller.scrollTop += outside
- extend(e)
- }), 50) }
- }
- }
-
- function done(e) {
- cm.state.selectingText = false
- counter = Infinity
- e_preventDefault(e)
- display.input.focus()
- off(document, "mousemove", move)
- off(document, "mouseup", up)
- doc.history.lastSelOrigin = null
- }
-
- var move = operation(cm, function (e) {
- if (!e_button(e)) { done(e) }
- else { extend(e) }
- })
- var up = operation(cm, done)
- cm.state.selectingText = up
- on(document, "mousemove", move)
- on(document, "mouseup", up)
-}
-
-
-// Determines whether an event happened in the gutter, and fires the
-// handlers for the corresponding event.
-function gutterEvent(cm, e, type, prevent) {
- var mX, mY
- try { mX = e.clientX; mY = e.clientY }
- catch(e) { return false }
- if (mX >= Math.floor(cm.display.gutters.getBoundingClientRect().right)) { return false }
- if (prevent) { e_preventDefault(e) }
-
- var display = cm.display
- var lineBox = display.lineDiv.getBoundingClientRect()
-
- if (mY > lineBox.bottom || !hasHandler(cm, type)) { return e_defaultPrevented(e) }
- mY -= lineBox.top - display.viewOffset
-
- for (var i = 0; i < cm.options.gutters.length; ++i) {
- var g = display.gutters.childNodes[i]
- if (g && g.getBoundingClientRect().right >= mX) {
- var line = lineAtHeight(cm.doc, mY)
- var gutter = cm.options.gutters[i]
- signal(cm, type, cm, line, gutter, e)
- return e_defaultPrevented(e)
- }
- }
-}
-
-function clickInGutter(cm, e) {
- return gutterEvent(cm, e, "gutterClick", true)
-}
-
-// CONTEXT MENU HANDLING
-
-// To make the context menu work, we need to briefly unhide the
-// textarea (making it as unobtrusive as possible) to let the
-// right-click take effect on it.
-function onContextMenu(cm, e) {
- if (eventInWidget(cm.display, e) || contextMenuInGutter(cm, e)) { return }
- if (signalDOMEvent(cm, e, "contextmenu")) { return }
- cm.display.input.onContextMenu(e)
-}
-
-function contextMenuInGutter(cm, e) {
- if (!hasHandler(cm, "gutterContextMenu")) { return false }
- return gutterEvent(cm, e, "gutterContextMenu", false)
-}
-
-function themeChanged(cm) {
- cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-s-\S+/g, "") +
- cm.options.theme.replace(/(^|\s)\s*/g, " cm-s-")
- clearCaches(cm)
-}
-
-var Init = {toString: function(){return "CodeMirror.Init"}}
-
-var defaults = {}
-var optionHandlers = {}
-
-function defineOptions(CodeMirror) {
- var optionHandlers = CodeMirror.optionHandlers
-
- function option(name, deflt, handle, notOnInit) {
- CodeMirror.defaults[name] = deflt
- if (handle) { optionHandlers[name] =
- notOnInit ? function (cm, val, old) {if (old != Init) { handle(cm, val, old) }} : handle }
- }
-
- CodeMirror.defineOption = option
-
- // Passed to option handlers when there is no old value.
- CodeMirror.Init = Init
-
- // These two are, on init, called from the constructor because they
- // have to be initialized before the editor can start at all.
- option("value", "", function (cm, val) { return cm.setValue(val); }, true)
- option("mode", null, function (cm, val) {
- cm.doc.modeOption = val
- loadMode(cm)
- }, true)
-
- option("indentUnit", 2, loadMode, true)
- option("indentWithTabs", false)
- option("smartIndent", true)
- option("tabSize", 4, function (cm) {
- resetModeState(cm)
- clearCaches(cm)
- regChange(cm)
- }, true)
- option("lineSeparator", null, function (cm, val) {
- cm.doc.lineSep = val
- if (!val) { return }
- var newBreaks = [], lineNo = cm.doc.first
- cm.doc.iter(function (line) {
- for (var pos = 0;;) {
- var found = line.text.indexOf(val, pos)
- if (found == -1) { break }
- pos = found + val.length
- newBreaks.push(Pos(lineNo, found))
- }
- lineNo++
- })
- 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\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff]/g, function (cm, val, old) {
- cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g")
- if (old != Init) { cm.refresh() }
- })
- option("specialCharPlaceholder", defaultSpecialCharPlaceholder, function (cm) { return cm.refresh(); }, true)
- option("electricChars", true)
- option("inputStyle", mobile ? "contenteditable" : "textarea", function () {
- throw new Error("inputStyle can not (yet) be changed in a running editor") // FIXME
- }, true)
- option("spellcheck", false, function (cm, val) { return cm.getInputField().spellcheck = val; }, true)
- option("rtlMoveVisually", !windows)
- option("wholeLineUpdateBefore", true)
-
- option("theme", "default", function (cm) {
- themeChanged(cm)
- guttersChanged(cm)
- }, true)
- option("keyMap", "default", function (cm, val, old) {
- var next = getKeyMap(val)
- var prev = old != Init && getKeyMap(old)
- if (prev && prev.detach) { prev.detach(cm, next) }
- if (next.attach) { next.attach(cm, prev || null) }
- })
- option("extraKeys", null)
-
- option("lineWrapping", false, wrappingChanged, true)
- option("gutters", [], function (cm) {
- setGuttersForLineNumbers(cm.options)
- guttersChanged(cm)
- }, true)
- option("fixedGutter", true, function (cm, val) {
- cm.display.gutters.style.left = val ? compensateForHScroll(cm.display) + "px" : "0"
- cm.refresh()
- }, true)
- option("coverGutterNextToScrollbar", false, function (cm) { return updateScrollbars(cm); }, true)
- option("scrollbarStyle", "native", function (cm) {
- initScrollbars(cm)
- updateScrollbars(cm)
- cm.display.scrollbars.setScrollTop(cm.doc.scrollTop)
- cm.display.scrollbars.setScrollLeft(cm.doc.scrollLeft)
- }, true)
- option("lineNumbers", false, function (cm) {
- setGuttersForLineNumbers(cm.options)
- guttersChanged(cm)
- }, true)
- option("firstLineNumber", 1, guttersChanged, true)
- option("lineNumberFormatter", function (integer) { return integer; }, guttersChanged, true)
- option("showCursorWhenSelecting", false, updateSelection, true)
-
- option("resetSelectionOnContextMenu", true)
- option("lineWiseCopyCut", true)
-
- option("readOnly", false, function (cm, val) {
- if (val == "nocursor") {
- onBlur(cm)
- cm.display.input.blur()
- cm.display.disabled = true
- } else {
- cm.display.disabled = false
- }
- cm.display.input.readOnlyChanged(val)
- })
- option("disableInput", false, function (cm, val) {if (!val) { cm.display.input.reset() }}, true)
- option("dragDrop", true, dragDropChanged)
- option("allowDropFileTypes", null)
-
- option("cursorBlinkRate", 530)
- option("cursorScrollMargin", 0)
- option("cursorHeight", 1, updateSelection, true)
- option("singleCursorHeightPerLine", true, updateSelection, true)
- option("workTime", 100)
- option("workDelay", 100)
- option("flattenSpans", true, resetModeState, true)
- option("addModeClass", false, resetModeState, true)
- option("pollInterval", 100)
- option("undoDepth", 200, function (cm, val) { return cm.doc.history.undoDepth = val; })
- option("historyEventDelay", 1250)
- option("viewportMargin", 10, function (cm) { return cm.refresh(); }, true)
- option("maxHighlightLength", 10000, resetModeState, true)
- option("moveInputWithCursor", true, function (cm, val) {
- if (!val) { cm.display.input.resetPosition() }
- })
-
- option("tabindex", null, function (cm, val) { return cm.display.input.getField().tabIndex = val || ""; })
- option("autofocus", null)
-}
-
-function guttersChanged(cm) {
- updateGutters(cm)
- regChange(cm)
- alignHorizontally(cm)
-}
-
-function dragDropChanged(cm, value, old) {
- var wasOn = old && old != Init
- if (!value != !wasOn) {
- var funcs = cm.display.dragFunctions
- var toggle = value ? on : off
- toggle(cm.display.scroller, "dragstart", funcs.start)
- toggle(cm.display.scroller, "dragenter", funcs.enter)
- toggle(cm.display.scroller, "dragover", funcs.over)
- toggle(cm.display.scroller, "dragleave", funcs.leave)
- toggle(cm.display.scroller, "drop", funcs.drop)
- }
-}
-
-function wrappingChanged(cm) {
- if (cm.options.lineWrapping) {
- addClass(cm.display.wrapper, "CodeMirror-wrap")
- cm.display.sizer.style.minWidth = ""
- cm.display.sizerWidth = null
- } else {
- rmClass(cm.display.wrapper, "CodeMirror-wrap")
- findMaxLine(cm)
- }
- estimateLineHeights(cm)
- regChange(cm)
- clearCaches(cm)
- setTimeout(function () { return updateScrollbars(cm); }, 100)
-}
-
-// A CodeMirror instance represents an editor. This is the object
-// that user code is usually dealing with.
-
-function CodeMirror(place, options) {
- var this$1 = this;
-
- if (!(this instanceof CodeMirror)) { return new CodeMirror(place, options) }
-
- this.options = options = options ? copyObj(options) : {}
- // Determine effective options based on given values and defaults.
- copyObj(defaults, options, false)
- setGuttersForLineNumbers(options)
-
- var doc = options.value
- if (typeof doc == "string") { doc = new Doc(doc, options.mode, null, options.lineSeparator) }
- this.doc = doc
-
- var input = new CodeMirror.inputStyles[options.inputStyle](this)
- var display = this.display = new Display(place, doc, input)
- display.wrapper.CodeMirror = this
- updateGutters(this)
- themeChanged(this)
- if (options.lineWrapping)
- { this.display.wrapper.className += " CodeMirror-wrap" }
- initScrollbars(this)
-
- this.state = {
- keyMaps: [], // stores maps added by addKeyMap
- overlays: [], // highlighting overlays, as added by addOverlay
- modeGen: 0, // bumped when mode/overlay changes, used to invalidate highlighting info
- overwrite: false,
- delayingBlurEvent: false,
- focused: false,
- suppressEdits: false, // used to disable editing during key handlers when in readOnly mode
- pasteIncoming: false, cutIncoming: false, // help recognize paste/cut edits in input.poll
- selectingText: false,
- draggingText: false,
- highlight: new Delayed(), // stores highlight worker timeout
- keySeq: null, // Unfinished key sequence
- specialChars: null
- }
-
- if (options.autofocus && !mobile) { display.input.focus() }
-
- // Override magic textarea content restore that IE sometimes does
- // on our hidden textarea on reload
- if (ie && ie_version < 11) { setTimeout(function () { return this$1.display.input.reset(true); }, 20) }
-
- registerEventHandlers(this)
- ensureGlobalHandlers()
-
- startOperation(this)
- this.curOp.forceUpdate = true
- attachDoc(this, doc)
-
- if ((options.autofocus && !mobile) || this.hasFocus())
- { setTimeout(bind(onFocus, this), 20) }
- else
- { onBlur(this) }
-
- for (var opt in optionHandlers) { if (optionHandlers.hasOwnProperty(opt))
- { optionHandlers[opt](this$1, options[opt], Init) } }
- maybeUpdateLineNumberWidth(this)
- if (options.finishInit) { options.finishInit(this) }
- for (var i = 0; i < initHooks.length; ++i) { initHooks[i](this$1) }
- endOperation(this)
- // Suppress optimizelegibility in Webkit, since it breaks text
- // measuring on line wrapping boundaries.
- if (webkit && options.lineWrapping &&
- getComputedStyle(display.lineDiv).textRendering == "optimizelegibility")
- { display.lineDiv.style.textRendering = "auto" }
-}
-
-// The default configuration options.
-CodeMirror.defaults = defaults
-// Functions to run when options are changed.
-CodeMirror.optionHandlers = optionHandlers
-
-// Attach the necessary event handlers when initializing the editor
-function registerEventHandlers(cm) {
- var d = cm.display
- on(d.scroller, "mousedown", operation(cm, onMouseDown))
- // Older IE's will not fire a second mousedown for a double click
- if (ie && ie_version < 11)
- { on(d.scroller, "dblclick", operation(cm, function (e) {
- if (signalDOMEvent(cm, e)) { return }
- var pos = posFromMouse(cm, e)
- if (!pos || clickInGutter(cm, e) || eventInWidget(cm.display, e)) { return }
- e_preventDefault(e)
- var word = cm.findWordAt(pos)
- extendSelection(cm.doc, word.anchor, word.head)
- })) }
- else
- { on(d.scroller, "dblclick", function (e) { return signalDOMEvent(cm, e) || e_preventDefault(e); }) }
- // Some browsers fire contextmenu *after* opening the menu, at
- // which point we can't mess with it anymore. Context menu is
- // handled in onMouseDown for these browsers.
- if (!captureRightClick) { on(d.scroller, "contextmenu", function (e) { return onContextMenu(cm, e); }) }
-
- // Used to suppress mouse event handling when a touch happens
- var touchFinished, prevTouch = {end: 0}
- function finishTouch() {
- if (d.activeTouch) {
- touchFinished = setTimeout(function () { return d.activeTouch = null; }, 1000)
- prevTouch = d.activeTouch
- prevTouch.end = +new Date
- }
- }
- function isMouseLikeTouchEvent(e) {
- if (e.touches.length != 1) { return false }
- var touch = e.touches[0]
- return touch.radiusX <= 1 && touch.radiusY <= 1
- }
- function farAway(touch, other) {
- if (other.left == null) { return true }
- var dx = other.left - touch.left, dy = other.top - touch.top
- return dx * dx + dy * dy > 20 * 20
- }
- on(d.scroller, "touchstart", function (e) {
- if (!signalDOMEvent(cm, e) && !isMouseLikeTouchEvent(e)) {
- d.input.ensurePolled()
- clearTimeout(touchFinished)
- var now = +new Date
- d.activeTouch = {start: now, moved: false,
- prev: now - prevTouch.end <= 300 ? prevTouch : null}
- if (e.touches.length == 1) {
- d.activeTouch.left = e.touches[0].pageX
- d.activeTouch.top = e.touches[0].pageY
- }
- }
- })
- on(d.scroller, "touchmove", function () {
- if (d.activeTouch) { d.activeTouch.moved = true }
- })
- on(d.scroller, "touchend", function (e) {
- var touch = d.activeTouch
- if (touch && !eventInWidget(d, e) && touch.left != null &&
- !touch.moved && new Date - touch.start < 300) {
- var pos = cm.coordsChar(d.activeTouch, "page"), range
- if (!touch.prev || farAway(touch, touch.prev)) // Single tap
- { range = new Range(pos, pos) }
- else if (!touch.prev.prev || farAway(touch, touch.prev.prev)) // Double tap
- { range = cm.findWordAt(pos) }
- else // Triple tap
- { range = new Range(Pos(pos.line, 0), clipPos(cm.doc, Pos(pos.line + 1, 0))) }
- cm.setSelection(range.anchor, range.head)
- cm.focus()
- e_preventDefault(e)
- }
- finishTouch()
- })
- on(d.scroller, "touchcancel", finishTouch)
-
- // Sync scrolling between fake scrollbars and real scrollable
- // area, ensure viewport is updated when scrolling.
- on(d.scroller, "scroll", function () {
- if (d.scroller.clientHeight) {
- setScrollTop(cm, d.scroller.scrollTop)
- setScrollLeft(cm, d.scroller.scrollLeft, true)
- signal(cm, "scroll", cm)
- }
- })
-
- // Listen to wheel events in order to try and update the viewport on time.
- on(d.scroller, "mousewheel", function (e) { return onScrollWheel(cm, e); })
- on(d.scroller, "DOMMouseScroll", function (e) { return onScrollWheel(cm, e); })
-
- // Prevent wrapper from ever scrolling
- on(d.wrapper, "scroll", function () { return d.wrapper.scrollTop = d.wrapper.scrollLeft = 0; })
-
- d.dragFunctions = {
- enter: function (e) {if (!signalDOMEvent(cm, e)) { e_stop(e) }},
- over: function (e) {if (!signalDOMEvent(cm, e)) { onDragOver(cm, e); e_stop(e) }},
- start: function (e) { return onDragStart(cm, e); },
- drop: operation(cm, onDrop),
- leave: function (e) {if (!signalDOMEvent(cm, e)) { clearDragCursor(cm) }}
- }
-
- var inp = d.input.getField()
- on(inp, "keyup", function (e) { return onKeyUp.call(cm, e); })
- on(inp, "keydown", operation(cm, onKeyDown))
- on(inp, "keypress", operation(cm, onKeyPress))
- on(inp, "focus", function (e) { return onFocus(cm, e); })
- on(inp, "blur", function (e) { return onBlur(cm, e); })
-}
-
-var initHooks = []
-CodeMirror.defineInitHook = function (f) { return initHooks.push(f); }
-
-// Indent the given line. The how parameter can be "smart",
-// "add"/null, "subtract", or "prev". When aggressive is false
-// (typically set to true for forced single-line indents), empty
-// lines are not indented, and places where the mode returns Pass
-// are left alone.
-function indentLine(cm, n, how, aggressive) {
- var doc = cm.doc, state
- if (how == null) { how = "add" }
- if (how == "smart") {
- // Fall back to "prev" when the mode doesn't have an indentation
- // method.
- if (!doc.mode.indent) { how = "prev" }
- else { state = getStateBefore(cm, n) }
- }
-
- var tabSize = cm.options.tabSize
- var line = getLine(doc, n), curSpace = countColumn(line.text, null, tabSize)
- if (line.stateAfter) { line.stateAfter = null }
- var curSpaceString = line.text.match(/^\s*/)[0], indentation
- if (!aggressive && !/\S/.test(line.text)) {
- indentation = 0
- how = "not"
- } else if (how == "smart") {
- indentation = doc.mode.indent(state, line.text.slice(curSpaceString.length), line.text)
- if (indentation == Pass || indentation > 150) {
- if (!aggressive) { return }
- how = "prev"
- }
- }
- if (how == "prev") {
- if (n > doc.first) { indentation = countColumn(getLine(doc, n-1).text, null, tabSize) }
- else { indentation = 0 }
- } else if (how == "add") {
- indentation = curSpace + cm.options.indentUnit
- } else if (how == "subtract") {
- indentation = curSpace - cm.options.indentUnit
- } else if (typeof how == "number") {
- indentation = curSpace + how
- }
- indentation = Math.max(0, indentation)
-
- var indentString = "", pos = 0
- if (cm.options.indentWithTabs)
- { for (var i = Math.floor(indentation / tabSize); i; --i) {pos += tabSize; indentString += "\t"} }
- if (pos < indentation) { indentString += spaceStr(indentation - pos) }
-
- if (indentString != curSpaceString) {
- replaceRange(doc, indentString, Pos(n, 0), Pos(n, curSpaceString.length), "+input")
- line.stateAfter = null
- return true
- } else {
- // Ensure that, if the cursor was in the whitespace at the start
- // of the line, it is moved to the end of that space.
- for (var i$1 = 0; i$1 < doc.sel.ranges.length; i$1++) {
- var range = doc.sel.ranges[i$1]
- if (range.head.line == n && range.head.ch < curSpaceString.length) {
- var pos$1 = Pos(n, curSpaceString.length)
- replaceOneSelection(doc, i$1, new Range(pos$1, pos$1))
- break
- }
- }
- }
-}
-
-// This will be set to a {lineWise: bool, text: [string]} object, so
-// that, when pasting, we know what kind of selections the copied
-// text was made out of.
-var lastCopied = null
-
-function setLastCopied(newLastCopied) {
- lastCopied = newLastCopied
-}
-
-function applyTextInput(cm, inserted, deleted, sel, origin) {
- var doc = cm.doc
- cm.display.shift = false
- if (!sel) { sel = doc.sel }
-
- var paste = cm.state.pasteIncoming || origin == "paste"
- var textLines = splitLinesAuto(inserted), multiPaste = null
- // When pasing N lines into N selections, insert one line per selection
- if (paste && sel.ranges.length > 1) {
- if (lastCopied && lastCopied.text.join("\n") == inserted) {
- if (sel.ranges.length % lastCopied.text.length == 0) {
- multiPaste = []
- for (var i = 0; i < lastCopied.text.length; i++)
- { multiPaste.push(doc.splitLines(lastCopied.text[i])) }
- }
- } else if (textLines.length == sel.ranges.length) {
- multiPaste = map(textLines, function (l) { return [l]; })
- }
- }
-
- var updateInput
- // Normal behavior is to insert the new text into every selection
- for (var i$1 = sel.ranges.length - 1; i$1 >= 0; i$1--) {
- var range = sel.ranges[i$1]
- var from = range.from(), to = range.to()
- if (range.empty()) {
- if (deleted && deleted > 0) // Handle deletion
- { from = Pos(from.line, from.ch - deleted) }
- else if (cm.state.overwrite && !paste) // Handle overwrite
- { to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length)) }
- else if (lastCopied && lastCopied.lineWise && lastCopied.text.join("\n") == inserted)
- { from = to = Pos(from.line, 0) }
- }
- updateInput = cm.curOp.updateInput
- var changeEvent = {from: from, to: to, text: multiPaste ? multiPaste[i$1 % multiPaste.length] : textLines,
- origin: origin || (paste ? "paste" : cm.state.cutIncoming ? "cut" : "+input")}
- makeChange(cm.doc, changeEvent)
- signalLater(cm, "inputRead", cm, changeEvent)
- }
- if (inserted && !paste)
- { triggerElectric(cm, inserted) }
-
- ensureCursorVisible(cm)
- cm.curOp.updateInput = updateInput
- cm.curOp.typing = true
- cm.state.pasteIncoming = cm.state.cutIncoming = false
-}
-
-function handlePaste(e, cm) {
- var pasted = e.clipboardData && e.clipboardData.getData("Text")
- if (pasted) {
- e.preventDefault()
- if (!cm.isReadOnly() && !cm.options.disableInput)
- { runInOp(cm, function () { return applyTextInput(cm, pasted, 0, null, "paste"); }) }
- return true
- }
-}
-
-function triggerElectric(cm, inserted) {
- // When an 'electric' character is inserted, immediately trigger a reindent
- if (!cm.options.electricChars || !cm.options.smartIndent) { return }
- var sel = cm.doc.sel
-
- for (var i = sel.ranges.length - 1; i >= 0; i--) {
- var range = sel.ranges[i]
- if (range.head.ch > 100 || (i && sel.ranges[i - 1].head.line == range.head.line)) { continue }
- var mode = cm.getModeAt(range.head)
- var indented = false
- if (mode.electricChars) {
- for (var j = 0; j < mode.electricChars.length; j++)
- { if (inserted.indexOf(mode.electricChars.charAt(j)) > -1) {
- indented = indentLine(cm, range.head.line, "smart")
- break
- } }
- } else if (mode.electricInput) {
- if (mode.electricInput.test(getLine(cm.doc, range.head.line).text.slice(0, range.head.ch)))
- { indented = indentLine(cm, range.head.line, "smart") }
- }
- if (indented) { signalLater(cm, "electricInput", cm, range.head.line) }
- }
-}
-
-function copyableRanges(cm) {
- var text = [], ranges = []
- for (var i = 0; i < cm.doc.sel.ranges.length; i++) {
- var line = cm.doc.sel.ranges[i].head.line
- var lineRange = {anchor: Pos(line, 0), head: Pos(line + 1, 0)}
- ranges.push(lineRange)
- text.push(cm.getRange(lineRange.anchor, lineRange.head))
- }
- return {text: text, ranges: ranges}
-}
-
-function disableBrowserMagic(field, spellcheck) {
- field.setAttribute("autocorrect", "off")
- field.setAttribute("autocapitalize", "off")
- field.setAttribute("spellcheck", !!spellcheck)
-}
-
-function hiddenTextarea() {
- var te = elt("textarea", null, null, "position: absolute; bottom: -1em; padding: 0; width: 1px; height: 1em; outline: none")
- var div = elt("div", [te], null, "overflow: hidden; position: relative; width: 3px; height: 0px;")
- // The textarea is kept positioned near the cursor to prevent the
- // fact that it'll be scrolled into view on input from scrolling
- // our fake cursor out of view. On webkit, when wrap=off, paste is
- // very slow. So make the area wide instead.
- if (webkit) { te.style.width = "1000px" }
- else { te.setAttribute("wrap", "off") }
- // If border: 0; -- iOS fails to open keyboard (issue #1287)
- if (ios) { te.style.border = "1px solid black" }
- disableBrowserMagic(te)
- return div
-}
-
-// The publicly visible API. Note that methodOp(f) means
-// 'wrap f in an operation, performed on its `this` parameter'.
-
-// This is not the complete set of editor methods. Most of the
-// methods defined on the Doc type are also injected into
-// CodeMirror.prototype, for backwards compatibility and
-// convenience.
-
-function addEditorMethods(CodeMirror) {
- var optionHandlers = CodeMirror.optionHandlers
-
- var helpers = CodeMirror.helpers = {}
-
- CodeMirror.prototype = {
- constructor: CodeMirror,
- focus: function(){window.focus(); this.display.input.focus()},
-
- setOption: function(option, value) {
- var options = this.options, old = options[option]
- if (options[option] == value && option != "mode") { return }
- options[option] = value
- if (optionHandlers.hasOwnProperty(option))
- { operation(this, optionHandlers[option])(this, value, old) }
- signal(this, "optionChange", this, option)
- },
-
- getOption: function(option) {return this.options[option]},
- getDoc: function() {return this.doc},
-
- addKeyMap: function(map, bottom) {
- this.state.keyMaps[bottom ? "push" : "unshift"](getKeyMap(map))
- },
- removeKeyMap: function(map) {
- var maps = this.state.keyMaps
- for (var i = 0; i < maps.length; ++i)
- { if (maps[i] == map || maps[i].name == map) {
- maps.splice(i, 1)
- return true
- } }
- },
-
- addOverlay: methodOp(function(spec, options) {
- var mode = spec.token ? spec : CodeMirror.getMode(this.options, spec)
- if (mode.startState) { throw new Error("Overlays may not be stateful.") }
- insertSorted(this.state.overlays,
- {mode: mode, modeSpec: spec, opaque: options && options.opaque,
- priority: (options && options.priority) || 0},
- function (overlay) { return overlay.priority; })
- this.state.modeGen++
- regChange(this)
- }),
- removeOverlay: methodOp(function(spec) {
- var this$1 = this;
-
- var overlays = this.state.overlays
- for (var i = 0; i < overlays.length; ++i) {
- var cur = overlays[i].modeSpec
- if (cur == spec || typeof spec == "string" && cur.name == spec) {
- overlays.splice(i, 1)
- this$1.state.modeGen++
- regChange(this$1)
- return
- }
- }
- }),
-
- indentLine: methodOp(function(n, dir, aggressive) {
- if (typeof dir != "string" && typeof dir != "number") {
- if (dir == null) { dir = this.options.smartIndent ? "smart" : "prev" }
- else { dir = dir ? "add" : "subtract" }
- }
- if (isLine(this.doc, n)) { indentLine(this, n, dir, aggressive) }
- }),
- indentSelection: methodOp(function(how) {
- var this$1 = this;
-
- var ranges = this.doc.sel.ranges, end = -1
- for (var i = 0; i < ranges.length; i++) {
- var range = ranges[i]
- if (!range.empty()) {
- var from = range.from(), to = range.to()
- var start = Math.max(end, from.line)
- end = Math.min(this$1.lastLine(), to.line - (to.ch ? 0 : 1)) + 1
- for (var j = start; j < end; ++j)
- { indentLine(this$1, j, how) }
- var newRanges = this$1.doc.sel.ranges
- if (from.ch == 0 && ranges.length == newRanges.length && newRanges[i].from().ch > 0)
- { replaceOneSelection(this$1.doc, i, new Range(from, newRanges[i].to()), sel_dontScroll) }
- } else if (range.head.line > end) {
- indentLine(this$1, range.head.line, how, true)
- end = range.head.line
- if (i == this$1.doc.sel.primIndex) { ensureCursorVisible(this$1) }
- }
- }
- }),
-
- // Fetch the parser token for a given character. Useful for hacks
- // that want to inspect the mode state (say, for completion).
- getTokenAt: function(pos, precise) {
- return takeToken(this, pos, precise)
- },
-
- getLineTokens: function(line, precise) {
- return takeToken(this, Pos(line), precise, true)
- },
-
- getTokenTypeAt: function(pos) {
- pos = clipPos(this.doc, pos)
- var styles = getLineStyles(this, getLine(this.doc, pos.line))
- var before = 0, after = (styles.length - 1) / 2, ch = pos.ch
- var type
- if (ch == 0) { type = styles[2] }
- else { for (;;) {
- var mid = (before + after) >> 1
- if ((mid ? styles[mid * 2 - 1] : 0) >= ch) { after = mid }
- else if (styles[mid * 2 + 1] < ch) { before = mid + 1 }
- else { type = styles[mid * 2 + 2]; break }
- } }
- var cut = type ? type.indexOf("overlay ") : -1
- return cut < 0 ? type : cut == 0 ? null : type.slice(0, cut - 1)
- },
-
- getModeAt: function(pos) {
- var mode = this.doc.mode
- if (!mode.innerMode) { return mode }
- return CodeMirror.innerMode(mode, this.getTokenAt(pos).state).mode
- },
-
- getHelper: function(pos, type) {
- return this.getHelpers(pos, type)[0]
- },
-
- getHelpers: function(pos, type) {
- var this$1 = this;
-
- var found = []
- if (!helpers.hasOwnProperty(type)) { return found }
- var help = helpers[type], mode = this.getModeAt(pos)
- if (typeof mode[type] == "string") {
- if (help[mode[type]]) { found.push(help[mode[type]]) }
- } else if (mode[type]) {
- for (var i = 0; i < mode[type].length; i++) {
- var val = help[mode[type][i]]
- if (val) { found.push(val) }
- }
- } else if (mode.helperType && help[mode.helperType]) {
- found.push(help[mode.helperType])
- } else if (help[mode.name]) {
- found.push(help[mode.name])
- }
- for (var i$1 = 0; i$1 < help._global.length; i$1++) {
- var cur = help._global[i$1]
- if (cur.pred(mode, this$1) && indexOf(found, cur.val) == -1)
- { found.push(cur.val) }
- }
- return found
- },
-
- getStateAfter: function(line, precise) {
- var doc = this.doc
- line = clipLine(doc, line == null ? doc.first + doc.size - 1: line)
- return getStateBefore(this, line + 1, precise)
- },
-
- cursorCoords: function(start, mode) {
- var pos, range = this.doc.sel.primary()
- if (start == null) { pos = range.head }
- else if (typeof start == "object") { pos = clipPos(this.doc, start) }
- else { pos = start ? range.from() : range.to() }
- return cursorCoords(this, pos, mode || "page")
- },
-
- charCoords: function(pos, mode) {
- return charCoords(this, clipPos(this.doc, pos), mode || "page")
- },
-
- coordsChar: function(coords, mode) {
- coords = fromCoordSystem(this, coords, mode || "page")
- return coordsChar(this, coords.left, coords.top)
- },
-
- lineAtHeight: function(height, mode) {
- height = fromCoordSystem(this, {top: height, left: 0}, mode || "page").top
- return lineAtHeight(this.doc, height + this.display.viewOffset)
- },
- heightAtLine: function(line, mode, includeWidgets) {
- var end = false, lineObj
- if (typeof line == "number") {
- var last = this.doc.first + this.doc.size - 1
- if (line < this.doc.first) { line = this.doc.first }
- else if (line > last) { line = last; end = true }
- lineObj = getLine(this.doc, line)
- } else {
- lineObj = line
- }
- return intoCoordSystem(this, lineObj, {top: 0, left: 0}, mode || "page", includeWidgets).top +
- (end ? this.doc.height - heightAtLine(lineObj) : 0)
- },
-
- defaultTextHeight: function() { return textHeight(this.display) },
- defaultCharWidth: function() { return charWidth(this.display) },
-
- getViewport: function() { return {from: this.display.viewFrom, to: this.display.viewTo}},
-
- addWidget: function(pos, node, scroll, vert, horiz) {
- var display = this.display
- pos = cursorCoords(this, clipPos(this.doc, pos))
- var top = pos.bottom, left = pos.left
- node.style.position = "absolute"
- node.setAttribute("cm-ignore-events", "true")
- this.display.input.setUneditable(node)
- display.sizer.appendChild(node)
- if (vert == "over") {
- top = pos.top
- } else if (vert == "above" || vert == "near") {
- var vspace = Math.max(display.wrapper.clientHeight, this.doc.height),
- hspace = Math.max(display.sizer.clientWidth, display.lineSpace.clientWidth)
- // Default to positioning above (if specified and possible); otherwise default to positioning below
- if ((vert == 'above' || pos.bottom + node.offsetHeight > vspace) && pos.top > node.offsetHeight)
- { top = pos.top - node.offsetHeight }
- else if (pos.bottom + node.offsetHeight <= vspace)
- { top = pos.bottom }
- if (left + node.offsetWidth > hspace)
- { left = hspace - node.offsetWidth }
- }
- node.style.top = top + "px"
- node.style.left = node.style.right = ""
- if (horiz == "right") {
- left = display.sizer.clientWidth - node.offsetWidth
- node.style.right = "0px"
- } else {
- if (horiz == "left") { left = 0 }
- else if (horiz == "middle") { left = (display.sizer.clientWidth - node.offsetWidth) / 2 }
- node.style.left = left + "px"
- }
- if (scroll)
- { scrollIntoView(this, left, top, left + node.offsetWidth, top + node.offsetHeight) }
- },
-
- triggerOnKeyDown: methodOp(onKeyDown),
- triggerOnKeyPress: methodOp(onKeyPress),
- triggerOnKeyUp: onKeyUp,
-
- execCommand: function(cmd) {
- if (commands.hasOwnProperty(cmd))
- { return commands[cmd].call(null, this) }
- },
-
- triggerElectric: methodOp(function(text) { triggerElectric(this, text) }),
-
- findPosH: function(from, amount, unit, visually) {
- var this$1 = this;
-
- var dir = 1
- if (amount < 0) { dir = -1; amount = -amount }
- var cur = clipPos(this.doc, from)
- for (var i = 0; i < amount; ++i) {
- cur = findPosH(this$1.doc, cur, dir, unit, visually)
- if (cur.hitSide) { break }
- }
- return cur
- },
-
- moveH: methodOp(function(dir, unit) {
- var this$1 = this;
-
- this.extendSelectionsBy(function (range) {
- if (this$1.display.shift || this$1.doc.extend || range.empty())
- { return findPosH(this$1.doc, range.head, dir, unit, this$1.options.rtlMoveVisually) }
- else
- { return dir < 0 ? range.from() : range.to() }
- }, sel_move)
- }),
-
- deleteH: methodOp(function(dir, unit) {
- var sel = this.doc.sel, doc = this.doc
- if (sel.somethingSelected())
- { doc.replaceSelection("", null, "+delete") }
- else
- { deleteNearSelection(this, function (range) {
- var other = findPosH(doc, range.head, dir, unit, false)
- return dir < 0 ? {from: other, to: range.head} : {from: range.head, to: other}
- }) }
- }),
-
- findPosV: function(from, amount, unit, goalColumn) {
- var this$1 = this;
-
- var dir = 1, x = goalColumn
- if (amount < 0) { dir = -1; amount = -amount }
- var cur = clipPos(this.doc, from)
- for (var i = 0; i < amount; ++i) {
- var coords = cursorCoords(this$1, cur, "div")
- if (x == null) { x = coords.left }
- else { coords.left = x }
- cur = findPosV(this$1, coords, dir, unit)
- if (cur.hitSide) { break }
- }
- return cur
- },
-
- moveV: methodOp(function(dir, unit) {
- var this$1 = this;
-
- var doc = this.doc, goals = []
- var collapse = !this.display.shift && !doc.extend && doc.sel.somethingSelected()
- doc.extendSelectionsBy(function (range) {
- if (collapse)
- { return dir < 0 ? range.from() : range.to() }
- var headPos = cursorCoords(this$1, range.head, "div")
- if (range.goalColumn != null) { headPos.left = range.goalColumn }
- goals.push(headPos.left)
- var pos = findPosV(this$1, headPos, dir, unit)
- if (unit == "page" && range == doc.sel.primary())
- { addToScrollPos(this$1, null, charCoords(this$1, pos, "div").top - headPos.top) }
- return pos
- }, sel_move)
- if (goals.length) { for (var i = 0; i < doc.sel.ranges.length; i++)
- { doc.sel.ranges[i].goalColumn = goals[i] } }
- }),
-
- // Find the word at the given position (as returned by coordsChar).
- findWordAt: function(pos) {
- var doc = this.doc, line = getLine(doc, pos.line).text
- var start = pos.ch, end = pos.ch
- if (line) {
- var helper = this.getHelper(pos, "wordChars")
- if ((pos.xRel < 0 || end == line.length) && start) { --start; } else { ++end }
- var startChar = line.charAt(start)
- var check = isWordChar(startChar, helper)
- ? function (ch) { return isWordChar(ch, helper); }
- : /\s/.test(startChar) ? function (ch) { return /\s/.test(ch); }
- : function (ch) { return (!/\s/.test(ch) && !isWordChar(ch)); }
- while (start > 0 && check(line.charAt(start - 1))) { --start }
- while (end < line.length && check(line.charAt(end))) { ++end }
- }
- return new Range(Pos(pos.line, start), Pos(pos.line, end))
- },
-
- toggleOverwrite: function(value) {
- if (value != null && value == this.state.overwrite) { return }
- if (this.state.overwrite = !this.state.overwrite)
- { addClass(this.display.cursorDiv, "CodeMirror-overwrite") }
- else
- { rmClass(this.display.cursorDiv, "CodeMirror-overwrite") }
-
- signal(this, "overwriteToggle", this, this.state.overwrite)
- },
- hasFocus: function() { return this.display.input.getField() == activeElt() },
- isReadOnly: function() { return !!(this.options.readOnly || this.doc.cantEdit) },
-
- scrollTo: methodOp(function(x, y) {
- if (x != null || y != null) { resolveScrollToPos(this) }
- if (x != null) { this.curOp.scrollLeft = x }
- if (y != null) { this.curOp.scrollTop = y }
- }),
- getScrollInfo: function() {
- var scroller = this.display.scroller
- return {left: scroller.scrollLeft, top: scroller.scrollTop,
- height: scroller.scrollHeight - scrollGap(this) - this.display.barHeight,
- width: scroller.scrollWidth - scrollGap(this) - this.display.barWidth,
- clientHeight: displayHeight(this), clientWidth: displayWidth(this)}
- },
-
- scrollIntoView: methodOp(function(range, margin) {
- if (range == null) {
- range = {from: this.doc.sel.primary().head, to: null}
- if (margin == null) { margin = this.options.cursorScrollMargin }
- } else if (typeof range == "number") {
- range = {from: Pos(range, 0), to: null}
- } else if (range.from == null) {
- range = {from: range, to: null}
- }
- if (!range.to) { range.to = range.from }
- range.margin = margin || 0
-
- if (range.from.line != null) {
- resolveScrollToPos(this)
- this.curOp.scrollToPos = range
- } else {
- var sPos = calculateScrollPos(this, Math.min(range.from.left, range.to.left),
- Math.min(range.from.top, range.to.top) - range.margin,
- Math.max(range.from.right, range.to.right),
- Math.max(range.from.bottom, range.to.bottom) + range.margin)
- this.scrollTo(sPos.scrollLeft, sPos.scrollTop)
- }
- }),
-
- setSize: methodOp(function(width, height) {
- var this$1 = this;
-
- var interpret = function (val) { return typeof val == "number" || /^\d+$/.test(String(val)) ? val + "px" : val; }
- if (width != null) { this.display.wrapper.style.width = interpret(width) }
- if (height != null) { this.display.wrapper.style.height = interpret(height) }
- if (this.options.lineWrapping) { clearLineMeasurementCache(this) }
- var lineNo = this.display.viewFrom
- this.doc.iter(lineNo, this.display.viewTo, function (line) {
- if (line.widgets) { for (var i = 0; i < line.widgets.length; i++)
- { if (line.widgets[i].noHScroll) { regLineChange(this$1, lineNo, "widget"); break } } }
- ++lineNo
- })
- this.curOp.forceUpdate = true
- signal(this, "refresh", this)
- }),
-
- operation: function(f){return runInOp(this, f)},
-
- refresh: methodOp(function() {
- var oldHeight = this.display.cachedTextHeight
- regChange(this)
- this.curOp.forceUpdate = true
- clearCaches(this)
- this.scrollTo(this.doc.scrollLeft, this.doc.scrollTop)
- updateGutterSpace(this)
- if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5)
- { estimateLineHeights(this) }
- signal(this, "refresh", this)
- }),
-
- swapDoc: methodOp(function(doc) {
- var old = this.doc
- old.cm = null
- attachDoc(this, doc)
- clearCaches(this)
- this.display.input.reset()
- this.scrollTo(doc.scrollLeft, doc.scrollTop)
- this.curOp.forceScroll = true
- signalLater(this, "swapDoc", this, old)
- return old
- }),
-
- getInputField: function(){return this.display.input.getField()},
- getWrapperElement: function(){return this.display.wrapper},
- getScrollerElement: function(){return this.display.scroller},
- getGutterElement: function(){return this.display.gutters}
- }
- eventMixin(CodeMirror)
-
- CodeMirror.registerHelper = function(type, name, value) {
- if (!helpers.hasOwnProperty(type)) { helpers[type] = CodeMirror[type] = {_global: []} }
- helpers[type][name] = value
- }
- CodeMirror.registerGlobalHelper = function(type, name, predicate, value) {
- CodeMirror.registerHelper(type, name, value)
- helpers[type]._global.push({pred: predicate, val: value})
- }
-}
-
-// Used for horizontal relative motion. Dir is -1 or 1 (left or
-// right), unit can be "char", "column" (like char, but doesn't
-// cross line boundaries), "word" (across next word), or "group" (to
-// the start of next group of word or non-word-non-whitespace
-// chars). The visually param controls whether, in right-to-left
-// text, direction 1 means to move towards the next index in the
-// string, or towards the character to the right of the current
-// position. The resulting position will have a hitSide=true
-// property if it reached the end of the document.
-function findPosH(doc, pos, dir, unit, visually) {
- var line = pos.line, ch = pos.ch, origDir = dir
- var lineObj = getLine(doc, line)
- function findNextLine() {
- var l = line + dir
- if (l < doc.first || l >= doc.first + doc.size) { return false }
- line = l
- return lineObj = getLine(doc, l)
- }
- function moveOnce(boundToLine) {
- var next = (visually ? moveVisually : moveLogically)(lineObj, ch, dir, true)
- if (next == null) {
- if (!boundToLine && findNextLine()) {
- if (visually) { ch = (dir < 0 ? lineRight : lineLeft)(lineObj) }
- else { ch = dir < 0 ? lineObj.text.length : 0 }
- } else { return false }
- } else { ch = next }
- return true
- }
-
- if (unit == "char") {
- moveOnce()
- } else if (unit == "column") {
- moveOnce(true)
- } else if (unit == "word" || unit == "group") {
- var sawType = null, group = unit == "group"
- var helper = doc.cm && doc.cm.getHelper(pos, "wordChars")
- for (var first = true;; first = false) {
- if (dir < 0 && !moveOnce(!first)) { break }
- var cur = lineObj.text.charAt(ch) || "\n"
- var type = isWordChar(cur, helper) ? "w"
- : group && cur == "\n" ? "n"
- : !group || /\s/.test(cur) ? null
- : "p"
- if (group && !first && !type) { type = "s" }
- if (sawType && sawType != type) {
- if (dir < 0) {dir = 1; moveOnce()}
- break
- }
-
- if (type) { sawType = type }
- if (dir > 0 && !moveOnce(!first)) { break }
- }
- }
- var result = skipAtomic(doc, Pos(line, ch), pos, origDir, true)
- if (!cmp(pos, result)) { result.hitSide = true }
- return result
-}
-
-// For relative vertical movement. Dir may be -1 or 1. Unit can be
-// "page" or "line". The resulting position will have a hitSide=true
-// property if it reached the end of the document.
-function findPosV(cm, pos, dir, unit) {
- var doc = cm.doc, x = pos.left, y
- if (unit == "page") {
- var pageSize = Math.min(cm.display.wrapper.clientHeight, window.innerHeight || document.documentElement.clientHeight)
- var moveAmount = Math.max(pageSize - .5 * textHeight(cm.display), 3)
- y = (dir > 0 ? pos.bottom : pos.top) + dir * moveAmount
-
- } else if (unit == "line") {
- y = dir > 0 ? pos.bottom + 3 : pos.top - 3
- }
- var target
- for (;;) {
- target = coordsChar(cm, x, y)
- if (!target.outside) { break }
- if (dir < 0 ? y <= 0 : y >= doc.height) { target.hitSide = true; break }
- y += dir * 5
- }
- return target
-}
-
-// CONTENTEDITABLE INPUT STYLE
-
-var ContentEditableInput = function(cm) {
- this.cm = cm
- this.lastAnchorNode = this.lastAnchorOffset = this.lastFocusNode = this.lastFocusOffset = null
- this.polling = new Delayed()
- this.composing = null
- this.gracePeriod = false
- this.readDOMTimeout = null
-};
-
-ContentEditableInput.prototype.init = function (display) {
- var this$1 = this;
-
- var input = this, cm = input.cm
- var div = input.div = display.lineDiv
- disableBrowserMagic(div, cm.options.spellcheck)
-
- on(div, "paste", function (e) {
- if (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 () {
- if (!input.pollContent()) { regChange(cm) }
- }), 20) }
- })
-
- on(div, "compositionstart", function (e) {
- this$1.composing = {data: e.data, done: false}
- })
- on(div, "compositionupdate", function (e) {
- if (!this$1.composing) { this$1.composing = {data: e.data, done: false} }
- })
- on(div, "compositionend", function (e) {
- if (this$1.composing) {
- if (e.data != this$1.composing.data) { this$1.readFromDOMSoon() }
- this$1.composing.done = true
- }
- })
-
- on(div, "touchstart", function () { return input.forceCompositionEnd(); })
-
- on(div, "input", function () {
- if (!this$1.composing) { this$1.readFromDOMSoon() }
- })
-
- function onCopyCut(e) {
- if (signalDOMEvent(cm, e)) { return }
- if (cm.somethingSelected()) {
- setLastCopied({lineWise: false, text: cm.getSelections()})
- if (e.type == "cut") { cm.replaceSelection("", null, "cut") }
- } else if (!cm.options.lineWiseCopyCut) {
- return
- } else {
- var ranges = copyableRanges(cm)
- setLastCopied({lineWise: true, text: ranges.text})
- if (e.type == "cut") {
- cm.operation(function () {
- cm.setSelections(ranges.ranges, 0, sel_dontScroll)
- cm.replaceSelection("", null, "cut")
- })
- }
- }
- if (e.clipboardData) {
- e.clipboardData.clearData()
- var content = lastCopied.text.join("\n")
- // iOS exposes the clipboard API, but seems to discard content inserted into it
- e.clipboardData.setData("Text", content)
- if (e.clipboardData.getData("Text") == content) {
- e.preventDefault()
- return
- }
- }
- // Old-fashioned briefly-focus-a-textarea hack
- var kludge = hiddenTextarea(), te = kludge.firstChild
- cm.display.lineSpace.insertBefore(kludge, cm.display.lineSpace.firstChild)
- te.value = lastCopied.text.join("\n")
- var hadFocus = document.activeElement
- selectInput(te)
- setTimeout(function () {
- cm.display.lineSpace.removeChild(kludge)
- hadFocus.focus()
- if (hadFocus == div) { input.showPrimarySelection() }
- }, 50)
- }
- on(div, "copy", onCopyCut)
- on(div, "cut", onCopyCut)
-};
-
-ContentEditableInput.prototype.prepareSelection = function () {
- var result = prepareSelection(this.cm, false)
- result.focus = this.cm.state.focused
- return result
-};
-
-ContentEditableInput.prototype.showSelection = function (info, takeFocus) {
- if (!info || !this.cm.display.view.length) { return }
- if (info.focus || takeFocus) { this.showPrimarySelection() }
- this.showMultipleSelections(info)
-};
-
-ContentEditableInput.prototype.showPrimarySelection = function () {
- var sel = window.getSelection(), prim = this.cm.doc.sel.primary()
- var curAnchor = domToPos(this.cm, sel.anchorNode, sel.anchorOffset)
- var curFocus = domToPos(this.cm, sel.focusNode, sel.focusOffset)
- if (curAnchor && !curAnchor.bad && curFocus && !curFocus.bad &&
- cmp(minPos(curAnchor, curFocus), prim.from()) == 0 &&
- cmp(maxPos(curAnchor, curFocus), prim.to()) == 0)
- { return }
-
- var start = posToDOM(this.cm, prim.from())
- var end = posToDOM(this.cm, prim.to())
- if (!start && !end) { return }
-
- var view = this.cm.display.view
- var old = sel.rangeCount && sel.getRangeAt(0)
- if (!start) {
- start = {node: view[0].measure.map[2], offset: 0}
- } else if (!end) { // FIXME dangerously hacky
- var measure = view[view.length - 1].measure
- var map = measure.maps ? measure.maps[measure.maps.length - 1] : measure.map
- end = {node: map[map.length - 1], offset: map[map.length - 2] - map[map.length - 3]}
- }
-
- var rng
- try { rng = range(start.node, start.offset, end.offset, end.node) }
- catch(e) {} // Our model of the DOM might be outdated, in which case the range we try to set can be impossible
- if (rng) {
- if (!gecko && this.cm.state.focused) {
- sel.collapse(start.node, start.offset)
- if (!rng.collapsed) {
- sel.removeAllRanges()
- sel.addRange(rng)
- }
- } else {
- sel.removeAllRanges()
- sel.addRange(rng)
- }
- if (old && sel.anchorNode == null) { sel.addRange(old) }
- else if (gecko) { this.startGracePeriod() }
- }
- this.rememberSelection()
-};
-
-ContentEditableInput.prototype.startGracePeriod = function () {
- var this$1 = this;
-
- clearTimeout(this.gracePeriod)
- this.gracePeriod = setTimeout(function () {
- this$1.gracePeriod = false
- if (this$1.selectionChanged())
- { this$1.cm.operation(function () { return this$1.cm.curOp.selectionChanged = true; }) }
- }, 20)
-};
-
-ContentEditableInput.prototype.showMultipleSelections = function (info) {
- removeChildrenAndAdd(this.cm.display.cursorDiv, info.cursors)
- removeChildrenAndAdd(this.cm.display.selectionDiv, info.selection)
-};
-
-ContentEditableInput.prototype.rememberSelection = function () {
- var sel = window.getSelection()
- this.lastAnchorNode = sel.anchorNode; this.lastAnchorOffset = sel.anchorOffset
- this.lastFocusNode = sel.focusNode; this.lastFocusOffset = sel.focusOffset
-};
-
-ContentEditableInput.prototype.selectionInEditor = function () {
- var sel = window.getSelection()
- if (!sel.rangeCount) { return false }
- var node = sel.getRangeAt(0).commonAncestorContainer
- return contains(this.div, node)
-};
-
-ContentEditableInput.prototype.focus = function () {
- if (this.cm.options.readOnly != "nocursor") {
- if (!this.selectionInEditor())
- { this.showSelection(this.prepareSelection(), true) }
- this.div.focus()
- }
-};
-ContentEditableInput.prototype.blur = function () { this.div.blur() };
-ContentEditableInput.prototype.getField = function () { return this.div };
-
-ContentEditableInput.prototype.supportsTouch = function () { return true };
-
-ContentEditableInput.prototype.receivedFocus = function () {
- var input = this
- if (this.selectionInEditor())
- { this.pollSelection() }
- else
- { runInOp(this.cm, function () { return input.cm.curOp.selectionChanged = true; }) }
-
- function poll() {
- if (input.cm.state.focused) {
- input.pollSelection()
- input.polling.set(input.cm.options.pollInterval, poll)
- }
- }
- this.polling.set(this.cm.options.pollInterval, poll)
-};
-
-ContentEditableInput.prototype.selectionChanged = function () {
- var sel = window.getSelection()
- return sel.anchorNode != this.lastAnchorNode || sel.anchorOffset != this.lastAnchorOffset ||
- sel.focusNode != this.lastFocusNode || sel.focusOffset != this.lastFocusOffset
-};
-
-ContentEditableInput.prototype.pollSelection = function () {
- if (!this.composing && this.readDOMTimeout == null && !this.gracePeriod && this.selectionChanged()) {
- var sel = window.getSelection(), cm = this.cm
- this.rememberSelection()
- var anchor = domToPos(cm, sel.anchorNode, sel.anchorOffset)
- var head = domToPos(cm, sel.focusNode, sel.focusOffset)
- if (anchor && head) { runInOp(cm, function () {
- setSelection(cm.doc, simpleSelection(anchor, head), sel_dontScroll)
- if (anchor.bad || head.bad) { cm.curOp.selectionChanged = true }
- }) }
- }
-};
-
-ContentEditableInput.prototype.pollContent = function () {
- if (this.readDOMTimeout != null) {
- clearTimeout(this.readDOMTimeout)
- this.readDOMTimeout = null
- }
-
- var cm = this.cm, display = cm.display, sel = cm.doc.sel.primary()
- var from = sel.from(), to = sel.to()
- if (from.ch == 0 && from.line > cm.firstLine())
- { from = Pos(from.line - 1, getLine(cm.doc, from.line - 1).length) }
- if (to.ch == getLine(cm.doc, to.line).text.length && to.line < cm.lastLine())
- { to = Pos(to.line + 1, 0) }
- if (from.line < display.viewFrom || to.line > display.viewTo - 1) { return false }
-
- var fromIndex, fromLine, fromNode
- if (from.line == display.viewFrom || (fromIndex = findViewIndex(cm, from.line)) == 0) {
- fromLine = lineNo(display.view[0].line)
- fromNode = display.view[0].node
- } else {
- fromLine = lineNo(display.view[fromIndex].line)
- fromNode = display.view[fromIndex - 1].node.nextSibling
- }
- var toIndex = findViewIndex(cm, to.line)
- var toLine, toNode
- if (toIndex == display.view.length - 1) {
- toLine = display.viewTo - 1
- toNode = display.lineDiv.lastChild
- } else {
- toLine = lineNo(display.view[toIndex + 1].line) - 1
- toNode = display.view[toIndex + 1].node.previousSibling
- }
-
- if (!fromNode) { return false }
- var newText = cm.doc.splitLines(domTextBetween(cm, fromNode, toNode, fromLine, toLine))
- var oldText = getBetween(cm.doc, Pos(fromLine, 0), Pos(toLine, getLine(cm.doc, toLine).text.length))
- while (newText.length > 1 && oldText.length > 1) {
- if (lst(newText) == lst(oldText)) { newText.pop(); oldText.pop(); toLine-- }
- else if (newText[0] == oldText[0]) { newText.shift(); oldText.shift(); fromLine++ }
- else { break }
- }
-
- var cutFront = 0, cutEnd = 0
- var newTop = newText[0], oldTop = oldText[0], maxCutFront = Math.min(newTop.length, oldTop.length)
- while (cutFront < maxCutFront && newTop.charCodeAt(cutFront) == oldTop.charCodeAt(cutFront))
- { ++cutFront }
- var newBot = lst(newText), oldBot = lst(oldText)
- var maxCutEnd = Math.min(newBot.length - (newText.length == 1 ? cutFront : 0),
- oldBot.length - (oldText.length == 1 ? cutFront : 0))
- while (cutEnd < maxCutEnd &&
- newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1))
- { ++cutEnd }
-
- newText[newText.length - 1] = newBot.slice(0, newBot.length - cutEnd).replace(/^\u200b+/, "")
- newText[0] = newText[0].slice(cutFront).replace(/\u200b+$/, "")
-
- var chFrom = Pos(fromLine, cutFront)
- var chTo = Pos(toLine, oldText.length ? lst(oldText).length - cutEnd : 0)
- if (newText.length > 1 || newText[0] || cmp(chFrom, chTo)) {
- replaceRange(cm.doc, newText, chFrom, chTo, "+input")
- return true
- }
-};
-
-ContentEditableInput.prototype.ensurePolled = function () {
- this.forceCompositionEnd()
-};
-ContentEditableInput.prototype.reset = function () {
- this.forceCompositionEnd()
-};
-ContentEditableInput.prototype.forceCompositionEnd = function () {
- if (!this.composing) { return }
- clearTimeout(this.readDOMTimeout)
- this.composing = null
- if (!this.pollContent()) { regChange(this.cm) }
- this.div.blur()
- this.div.focus()
-};
-ContentEditableInput.prototype.readFromDOMSoon = function () {
- var this$1 = this;
-
- if (this.readDOMTimeout != null) { return }
- this.readDOMTimeout = setTimeout(function () {
- this$1.readDOMTimeout = null
- if (this$1.composing) {
- if (this$1.composing.done) { this$1.composing = null }
- else { return }
- }
- if (this$1.cm.isReadOnly() || !this$1.pollContent())
- { runInOp(this$1.cm, function () { return regChange(this$1.cm); }) }
- }, 80)
-};
-
-ContentEditableInput.prototype.setUneditable = function (node) {
- node.contentEditable = "false"
-};
-
-ContentEditableInput.prototype.onKeyPress = function (e) {
- e.preventDefault()
- if (!this.cm.isReadOnly())
- { operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0) }
-};
-
-ContentEditableInput.prototype.readOnlyChanged = function (val) {
- this.div.contentEditable = String(val != "nocursor")
-};
-
-ContentEditableInput.prototype.onContextMenu = function () {};
-ContentEditableInput.prototype.resetPosition = function () {};
-
-ContentEditableInput.prototype.needsContentAttribute = true
-
-function posToDOM(cm, pos) {
- var view = findViewForLine(cm, pos.line)
- if (!view || view.hidden) { return null }
- var line = getLine(cm.doc, pos.line)
- var info = mapFromLineView(view, line, pos.line)
-
- var order = getOrder(line), side = "left"
- if (order) {
- var partPos = getBidiPartAt(order, pos.ch)
- side = partPos % 2 ? "right" : "left"
- }
- var result = nodeAndOffsetInLineMap(info.map, pos.ch, side)
- result.offset = result.collapse == "right" ? result.end : result.start
- return result
-}
-
-function badPos(pos, bad) { if (bad) { pos.bad = true; } return pos }
-
-function domTextBetween(cm, from, to, fromLine, toLine) {
- var text = "", closing = false, lineSep = cm.doc.lineSeparator()
- function recognizeMarker(id) { return function (marker) { return marker.id == id; } }
- function walk(node) {
- if (node.nodeType == 1) {
- var cmText = node.getAttribute("cm-text")
- if (cmText != null) {
- if (cmText == "") { text += node.textContent.replace(/\u200b/g, "") }
- else { text += cmText }
- return
- }
- var markerID = node.getAttribute("cm-marker"), range
- if (markerID) {
- var found = cm.findMarks(Pos(fromLine, 0), Pos(toLine + 1, 0), recognizeMarker(+markerID))
- if (found.length && (range = found[0].find()))
- { text += getBetween(cm.doc, range.from, range.to).join(lineSep) }
- return
- }
- if (node.getAttribute("contenteditable") == "false") { return }
- for (var i = 0; i < node.childNodes.length; i++)
- { walk(node.childNodes[i]) }
- if (/^(pre|div|p)$/i.test(node.nodeName))
- { closing = true }
- } else if (node.nodeType == 3) {
- var val = node.nodeValue
- if (!val) { return }
- if (closing) {
- text += lineSep
- closing = false
- }
- text += val
- }
- }
- for (;;) {
- walk(from)
- if (from == to) { break }
- from = from.nextSibling
- }
- return text
-}
-
-function domToPos(cm, node, offset) {
- var lineNode
- if (node == cm.display.lineDiv) {
- lineNode = cm.display.lineDiv.childNodes[offset]
- if (!lineNode) { return badPos(cm.clipPos(Pos(cm.display.viewTo - 1)), true) }
- node = null; offset = 0
- } else {
- for (lineNode = node;; lineNode = lineNode.parentNode) {
- if (!lineNode || lineNode == cm.display.lineDiv) { return null }
- if (lineNode.parentNode && lineNode.parentNode == cm.display.lineDiv) { break }
- }
- }
- for (var i = 0; i < cm.display.view.length; i++) {
- var lineView = cm.display.view[i]
- if (lineView.node == lineNode)
- { return locateNodeInLineView(lineView, node, offset) }
- }
-}
-
-function locateNodeInLineView(lineView, node, offset) {
- var wrapper = lineView.text.firstChild, bad = false
- if (!node || !contains(wrapper, node)) { return badPos(Pos(lineNo(lineView.line), 0), true) }
- if (node == wrapper) {
- bad = true
- node = wrapper.childNodes[offset]
- offset = 0
- if (!node) {
- var line = lineView.rest ? lst(lineView.rest) : lineView.line
- return badPos(Pos(lineNo(line), line.text.length), bad)
- }
- }
-
- var textNode = node.nodeType == 3 ? node : null, topNode = node
- if (!textNode && node.childNodes.length == 1 && node.firstChild.nodeType == 3) {
- textNode = node.firstChild
- if (offset) { offset = textNode.nodeValue.length }
- }
- while (topNode.parentNode != wrapper) { topNode = topNode.parentNode }
- var measure = lineView.measure, maps = measure.maps
-
- function find(textNode, topNode, offset) {
- for (var i = -1; i < (maps ? maps.length : 0); i++) {
- var map = i < 0 ? measure.map : maps[i]
- for (var j = 0; j < map.length; j += 3) {
- var curNode = map[j + 2]
- if (curNode == textNode || curNode == topNode) {
- var line = lineNo(i < 0 ? lineView.line : lineView.rest[i])
- var ch = map[j] + offset
- if (offset < 0 || curNode != textNode) { ch = map[j + (offset ? 1 : 0)] }
- return Pos(line, ch)
- }
- }
- }
- }
- var found = find(textNode, topNode, offset)
- if (found) { return badPos(found, bad) }
-
- // FIXME this is all really shaky. might handle the few cases it needs to handle, but likely to cause problems
- for (var after = topNode.nextSibling, dist = textNode ? textNode.nodeValue.length - offset : 0; after; after = after.nextSibling) {
- found = find(after, after.firstChild, 0)
- if (found)
- { return badPos(Pos(found.line, found.ch - dist), bad) }
- else
- { dist += after.textContent.length }
- }
- for (var before = topNode.previousSibling, dist$1 = offset; before; before = before.previousSibling) {
- found = find(before, before.firstChild, -1)
- if (found)
- { return badPos(Pos(found.line, found.ch + dist$1), bad) }
- else
- { dist$1 += before.textContent.length }
- }
-}
-
-// TEXTAREA INPUT STYLE
-
-var TextareaInput = function(cm) {
- this.cm = cm
- // See input.poll and input.reset
- this.prevInput = ""
-
- // Flag that indicates whether we expect input to appear real soon
- // now (after some event like 'keypress' or 'input') and are
- // polling intensively.
- this.pollingFast = false
- // Self-resetting timeout for the poller
- this.polling = new Delayed()
- // Tracks when input.reset has punted to just putting a short
- // string into the textarea instead of the full selection.
- this.inaccurateSelection = false
- // Used to work around IE issue with selection being forgotten when focus moves away from textarea
- this.hasSelection = false
- this.composing = null
-};
-
-TextareaInput.prototype.init = function (display) {
- var this$1 = this;
-
- var input = this, cm = this.cm
-
- // Wraps and hides input textarea
- var div = this.wrapper = hiddenTextarea()
- // The semihidden textarea that is focused when the editor is
- // focused, and receives input.
- var te = this.textarea = div.firstChild
- display.wrapper.insertBefore(div, display.wrapper.firstChild)
-
- // Needed to hide big blue blinking cursor on Mobile Safari (doesn't seem to work in iOS 8 anymore)
- if (ios) { te.style.width = "0px" }
-
- on(te, "input", function () {
- if (ie && ie_version >= 9 && this$1.hasSelection) { this$1.hasSelection = null }
- input.poll()
- })
-
- on(te, "paste", function (e) {
- if (signalDOMEvent(cm, e) || handlePaste(e, cm)) { return }
-
- cm.state.pasteIncoming = true
- input.fastPoll()
- })
-
- function prepareCopyCut(e) {
- if (signalDOMEvent(cm, e)) { return }
- if (cm.somethingSelected()) {
- setLastCopied({lineWise: false, text: cm.getSelections()})
- if (input.inaccurateSelection) {
- input.prevInput = ""
- input.inaccurateSelection = false
- te.value = lastCopied.text.join("\n")
- selectInput(te)
- }
- } else if (!cm.options.lineWiseCopyCut) {
- return
- } else {
- var ranges = copyableRanges(cm)
- setLastCopied({lineWise: true, text: ranges.text})
- if (e.type == "cut") {
- cm.setSelections(ranges.ranges, null, sel_dontScroll)
- } else {
- input.prevInput = ""
- te.value = ranges.text.join("\n")
- selectInput(te)
- }
- }
- if (e.type == "cut") { cm.state.cutIncoming = true }
- }
- on(te, "cut", prepareCopyCut)
- on(te, "copy", prepareCopyCut)
-
- on(display.scroller, "paste", function (e) {
- if (eventInWidget(display, e) || signalDOMEvent(cm, e)) { return }
- cm.state.pasteIncoming = true
- input.focus()
- })
-
- // Prevent normal selection in the editor (we handle our own)
- on(display.lineSpace, "selectstart", function (e) {
- if (!eventInWidget(display, e)) { e_preventDefault(e) }
- })
-
- on(te, "compositionstart", function () {
- var start = cm.getCursor("from")
- if (input.composing) { input.composing.range.clear() }
- input.composing = {
- start: start,
- range: cm.markText(start, cm.getCursor("to"), {className: "CodeMirror-composing"})
- }
- })
- on(te, "compositionend", function () {
- if (input.composing) {
- input.poll()
- input.composing.range.clear()
- input.composing = null
- }
- })
-};
-
-TextareaInput.prototype.prepareSelection = function () {
- // Redraw the selection and/or cursor
- var cm = this.cm, display = cm.display, doc = cm.doc
- var result = prepareSelection(cm)
-
- // Move the hidden textarea near the cursor to prevent scrolling artifacts
- if (cm.options.moveInputWithCursor) {
- var headPos = cursorCoords(cm, doc.sel.primary().head, "div")
- var wrapOff = display.wrapper.getBoundingClientRect(), lineOff = display.lineDiv.getBoundingClientRect()
- result.teTop = Math.max(0, Math.min(display.wrapper.clientHeight - 10,
- headPos.top + lineOff.top - wrapOff.top))
- result.teLeft = Math.max(0, Math.min(display.wrapper.clientWidth - 10,
- headPos.left + lineOff.left - wrapOff.left))
- }
-
- return result
-};
-
-TextareaInput.prototype.showSelection = function (drawn) {
- var cm = this.cm, display = cm.display
- removeChildrenAndAdd(display.cursorDiv, drawn.cursors)
- removeChildrenAndAdd(display.selectionDiv, drawn.selection)
- if (drawn.teTop != null) {
- this.wrapper.style.top = drawn.teTop + "px"
- this.wrapper.style.left = drawn.teLeft + "px"
- }
-};
-
-// Reset the input to correspond to the selection (or to be empty,
-// when not typing and nothing is selected)
-TextareaInput.prototype.reset = function (typing) {
- if (this.contextMenuPending) { return }
- var minimal, selected, cm = this.cm, doc = cm.doc
- if (cm.somethingSelected()) {
- this.prevInput = ""
- var range = doc.sel.primary()
- minimal = hasCopyEvent &&
- (range.to().line - range.from().line > 100 || (selected = cm.getSelection()).length > 1000)
- var content = minimal ? "-" : selected || cm.getSelection()
- this.textarea.value = content
- if (cm.state.focused) { selectInput(this.textarea) }
- if (ie && ie_version >= 9) { this.hasSelection = content }
- } else if (!typing) {
- this.prevInput = this.textarea.value = ""
- if (ie && ie_version >= 9) { this.hasSelection = null }
- }
- this.inaccurateSelection = minimal
-};
-
-TextareaInput.prototype.getField = function () { return this.textarea };
-
-TextareaInput.prototype.supportsTouch = function () { return false };
-
-TextareaInput.prototype.focus = function () {
- if (this.cm.options.readOnly != "nocursor" && (!mobile || activeElt() != this.textarea)) {
- try { this.textarea.focus() }
- catch (e) {} // IE8 will throw if the textarea is display: none or not in DOM
- }
-};
-
-TextareaInput.prototype.blur = function () { this.textarea.blur() };
-
-TextareaInput.prototype.resetPosition = function () {
- this.wrapper.style.top = this.wrapper.style.left = 0
-};
-
-TextareaInput.prototype.receivedFocus = function () { this.slowPoll() };
-
-// Poll for input changes, using the normal rate of polling. This
-// runs as long as the editor is focused.
-TextareaInput.prototype.slowPoll = function () {
- var this$1 = this;
-
- if (this.pollingFast) { return }
- this.polling.set(this.cm.options.pollInterval, function () {
- this$1.poll()
- if (this$1.cm.state.focused) { this$1.slowPoll() }
- })
-};
-
-// When an event has just come in that is likely to add or change
-// something in the input textarea, we poll faster, to ensure that
-// the change appears on the screen quickly.
-TextareaInput.prototype.fastPoll = function () {
- var missed = false, input = this
- input.pollingFast = true
- function p() {
- var changed = input.poll()
- if (!changed && !missed) {missed = true; input.polling.set(60, p)}
- else {input.pollingFast = false; input.slowPoll()}
- }
- input.polling.set(20, p)
-};
-
-// Read input from the textarea, and update the document to match.
-// When something is selected, it is present in the textarea, and
-// selected (unless it is huge, in which case a placeholder is
-// used). When nothing is selected, the cursor sits after previously
-// seen text (can be empty), which is stored in prevInput (we must
-// not reset the textarea when typing, because that breaks IME).
-TextareaInput.prototype.poll = function () {
- var this$1 = this;
-
- var cm = this.cm, input = this.textarea, prevInput = this.prevInput
- // Since this is called a *lot*, try to bail out as cheaply as
- // possible when it is clear that nothing happened. hasSelection
- // will be the case when there is a lot of text in the textarea,
- // in which case reading its value would be expensive.
- if (this.contextMenuPending || !cm.state.focused ||
- (hasSelection(input) && !prevInput && !this.composing) ||
- cm.isReadOnly() || cm.options.disableInput || cm.state.keySeq)
- { return false }
-
- var text = input.value
- // If nothing changed, bail.
- if (text == prevInput && !cm.somethingSelected()) { return false }
- // Work around nonsensical selection resetting in IE9/10, and
- // inexplicable appearance of private area unicode characters on
- // some key combos in Mac (#2689).
- if (ie && ie_version >= 9 && this.hasSelection === text ||
- mac && /[\uf700-\uf7ff]/.test(text)) {
- cm.display.input.reset()
- return false
- }
-
- if (cm.doc.sel == cm.display.selForContextMenu) {
- var first = text.charCodeAt(0)
- if (first == 0x200b && !prevInput) { prevInput = "\u200b" }
- if (first == 0x21da) { this.reset(); return this.cm.execCommand("undo") }
- }
- // Find the part of the input that is actually new
- var same = 0, l = Math.min(prevInput.length, text.length)
- while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) { ++same }
-
- runInOp(cm, function () {
- applyTextInput(cm, text.slice(same), prevInput.length - same,
- null, this$1.composing ? "*compose" : null)
-
- // Don't leave long text in the textarea, since it makes further polling slow
- if (text.length > 1000 || text.indexOf("\n") > -1) { input.value = this$1.prevInput = "" }
- else { this$1.prevInput = text }
-
- if (this$1.composing) {
- this$1.composing.range.clear()
- this$1.composing.range = cm.markText(this$1.composing.start, cm.getCursor("to"),
- {className: "CodeMirror-composing"})
- }
- })
- return true
-};
-
-TextareaInput.prototype.ensurePolled = function () {
- if (this.pollingFast && this.poll()) { this.pollingFast = false }
-};
-
-TextareaInput.prototype.onKeyPress = function () {
- if (ie && ie_version >= 9) { this.hasSelection = null }
- this.fastPoll()
-};
-
-TextareaInput.prototype.onContextMenu = function (e) {
- var input = this, cm = input.cm, display = cm.display, te = input.textarea
- var pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop
- if (!pos || presto) { return } // Opera is difficult.
-
- // Reset the current text selection only if the click is done outside of the selection
- // and 'resetSelectionOnContextMenu' option is true.
- var reset = cm.options.resetSelectionOnContextMenu
- if (reset && cm.doc.sel.contains(pos) == -1)
- { operation(cm, setSelection)(cm.doc, simpleSelection(pos), sel_dontScroll) }
-
- var oldCSS = te.style.cssText, oldWrapperCSS = input.wrapper.style.cssText
- input.wrapper.style.cssText = "position: absolute"
- var wrapperBox = input.wrapper.getBoundingClientRect()
- te.style.cssText = "position: absolute; width: 30px; height: 30px;\n top: " + (e.clientY - wrapperBox.top - 5) + "px; left: " + (e.clientX - wrapperBox.left - 5) + "px;\n z-index: 1000; background: " + (ie ? "rgba(255, 255, 255, .05)" : "transparent") + ";\n outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);"
- var oldScrollY
- if (webkit) { oldScrollY = window.scrollY } // Work around Chrome issue (#2712)
- display.input.focus()
- if (webkit) { window.scrollTo(null, oldScrollY) }
- display.input.reset()
- // Adds "Select all" to context menu in FF
- if (!cm.somethingSelected()) { te.value = input.prevInput = " " }
- input.contextMenuPending = true
- display.selForContextMenu = cm.doc.sel
- clearTimeout(display.detectingSelectAll)
-
- // Select-all will be greyed out if there's nothing to select, so
- // this adds a zero-width space so that we can later check whether
- // it got selected.
- function prepareSelectAllHack() {
- if (te.selectionStart != null) {
- var selected = cm.somethingSelected()
- var extval = "\u200b" + (selected ? te.value : "")
- te.value = "\u21da" // Used to catch context-menu undo
- te.value = extval
- input.prevInput = selected ? "" : "\u200b"
- te.selectionStart = 1; te.selectionEnd = extval.length
- // Re-set this, in case some other handler touched the
- // selection in the meantime.
- display.selForContextMenu = cm.doc.sel
- }
- }
- function rehide() {
- input.contextMenuPending = false
- input.wrapper.style.cssText = oldWrapperCSS
- te.style.cssText = oldCSS
- if (ie && ie_version < 9) { display.scrollbars.setScrollTop(display.scroller.scrollTop = scrollPos) }
-
- // Try to detect the user choosing select-all
- if (te.selectionStart != null) {
- if (!ie || (ie && ie_version < 9)) { prepareSelectAllHack() }
- var i = 0, poll = function () {
- if (display.selForContextMenu == cm.doc.sel && te.selectionStart == 0 &&
- te.selectionEnd > 0 && input.prevInput == "\u200b")
- { operation(cm, selectAll)(cm) }
- else if (i++ < 10) { display.detectingSelectAll = setTimeout(poll, 500) }
- else { display.input.reset() }
- }
- display.detectingSelectAll = setTimeout(poll, 200)
- }
- }
-
- if (ie && ie_version >= 9) { prepareSelectAllHack() }
- if (captureRightClick) {
- e_stop(e)
- var mouseup = function () {
- off(window, "mouseup", mouseup)
- setTimeout(rehide, 20)
- }
- on(window, "mouseup", mouseup)
- } else {
- setTimeout(rehide, 50)
- }
-};
-
-TextareaInput.prototype.readOnlyChanged = function (val) {
- if (!val) { this.reset() }
-};
-
-TextareaInput.prototype.setUneditable = function () {};
-
-TextareaInput.prototype.needsContentAttribute = false
-
-function fromTextArea(textarea, options) {
- options = options ? copyObj(options) : {}
- options.value = textarea.value
- if (!options.tabindex && textarea.tabIndex)
- { options.tabindex = textarea.tabIndex }
- if (!options.placeholder && textarea.placeholder)
- { options.placeholder = textarea.placeholder }
- // Set autofocus to true if this textarea is focused, or if it has
- // autofocus and no other element is focused.
- if (options.autofocus == null) {
- var hasFocus = activeElt()
- options.autofocus = hasFocus == textarea ||
- textarea.getAttribute("autofocus") != null && hasFocus == document.body
- }
-
- function save() {textarea.value = cm.getValue()}
-
- var realSubmit
- if (textarea.form) {
- on(textarea.form, "submit", save)
- // Deplorable hack to make the submit method do the right thing.
- if (!options.leaveSubmitMethodAlone) {
- var form = textarea.form
- realSubmit = form.submit
- try {
- var wrappedSubmit = form.submit = function () {
- save()
- form.submit = realSubmit
- form.submit()
- form.submit = wrappedSubmit
- }
- } catch(e) {}
- }
- }
-
- options.finishInit = function (cm) {
- cm.save = save
- cm.getTextArea = function () { return textarea; }
- cm.toTextArea = function () {
- cm.toTextArea = isNaN // Prevent this from being ran twice
- save()
- textarea.parentNode.removeChild(cm.getWrapperElement())
- textarea.style.display = ""
- if (textarea.form) {
- off(textarea.form, "submit", save)
- if (typeof textarea.form.submit == "function")
- { textarea.form.submit = realSubmit }
- }
- }
- }
-
- textarea.style.display = "none"
- var cm = CodeMirror(function (node) { return textarea.parentNode.insertBefore(node, textarea.nextSibling); },
- options)
- return cm
-}
-
-function addLegacyProps(CodeMirror) {
- CodeMirror.off = off
- CodeMirror.on = on
- CodeMirror.wheelEventPixels = wheelEventPixels
- CodeMirror.Doc = Doc
- CodeMirror.splitLines = splitLinesAuto
- CodeMirror.countColumn = countColumn
- CodeMirror.findColumn = findColumn
- CodeMirror.isWordChar = isWordCharBasic
- CodeMirror.Pass = Pass
- CodeMirror.signal = signal
- CodeMirror.Line = Line
- CodeMirror.changeEnd = changeEnd
- CodeMirror.scrollbarModel = scrollbarModel
- CodeMirror.Pos = Pos
- CodeMirror.cmpPos = cmp
- CodeMirror.modes = modes
- CodeMirror.mimeModes = mimeModes
- CodeMirror.resolveMode = resolveMode
- CodeMirror.getMode = getMode
- CodeMirror.modeExtensions = modeExtensions
- CodeMirror.extendMode = extendMode
- CodeMirror.copyState = copyState
- CodeMirror.startState = startState
- CodeMirror.innerMode = innerMode
- CodeMirror.commands = commands
- CodeMirror.keyMap = keyMap
- CodeMirror.keyName = keyName
- CodeMirror.isModifierKey = isModifierKey
- CodeMirror.lookupKey = lookupKey
- CodeMirror.normalizeKeyMap = normalizeKeyMap
- CodeMirror.StringStream = StringStream
- CodeMirror.SharedTextMarker = SharedTextMarker
- CodeMirror.TextMarker = TextMarker
- CodeMirror.LineWidget = LineWidget
- CodeMirror.e_preventDefault = e_preventDefault
- CodeMirror.e_stopPropagation = e_stopPropagation
- CodeMirror.e_stop = e_stop
- CodeMirror.addClass = addClass
- CodeMirror.contains = contains
- CodeMirror.rmClass = rmClass
- CodeMirror.keyNames = keyNames
-}
-
-// EDITOR CONSTRUCTOR
-
-defineOptions(CodeMirror)
-
-addEditorMethods(CodeMirror)
-
-// Set up methods on CodeMirror's prototype to redirect to the editor's document.
-var dontDelegate = "iter insert remove copy getEditor constructor".split(" ")
-for (var prop in Doc.prototype) { if (Doc.prototype.hasOwnProperty(prop) && indexOf(dontDelegate, prop) < 0)
- { CodeMirror.prototype[prop] = (function(method) {
- return function() {return method.apply(this.doc, arguments)}
- })(Doc.prototype[prop]) } }
-
-eventMixin(Doc)
-
-// INPUT HANDLING
-
-CodeMirror.inputStyles = {"textarea": TextareaInput, "contenteditable": ContentEditableInput}
-
-// MODE DEFINITION AND QUERYING
-
-// Extra arguments are stored as the mode's dependencies, which is
-// used by (legacy) mechanisms like loadmode.js to automatically
-// load a mode. (Preferred mechanism is the require/define calls.)
-CodeMirror.defineMode = function(name/*, mode, …*/) {
- if (!CodeMirror.defaults.mode && name != "null") { CodeMirror.defaults.mode = name }
- defineMode.apply(this, arguments)
-}
-
-CodeMirror.defineMIME = defineMIME
-
-// Minimal default mode.
-CodeMirror.defineMode("null", function () { return ({token: function (stream) { return stream.skipToEnd(); }}); })
-CodeMirror.defineMIME("text/plain", "null")
-
-// EXTENSIONS
-
-CodeMirror.defineExtension = function (name, func) {
- CodeMirror.prototype[name] = func
-}
-CodeMirror.defineDocExtension = function (name, func) {
- Doc.prototype[name] = func
-}
-
-CodeMirror.fromTextArea = fromTextArea
-
-addLegacyProps(CodeMirror)
-
-CodeMirror.version = "5.23.0"
-
-return CodeMirror;
-
-})));
\ No newline at end of file
diff --git a/js/codemirror-5.23.0/mode/dockerfile/dockerfile.js b/js/codemirror-5.23.0/mode/dockerfile/dockerfile.js
deleted file mode 100644
index 4419009..0000000
--- a/js/codemirror-5.23.0/mode/dockerfile/dockerfile.js
+++ /dev/null
@@ -1,79 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://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";
-
- // Collect all Dockerfile directives
- var instructions = ["from", "maintainer", "run", "cmd", "expose", "env",
- "add", "copy", "entrypoint", "volume", "user",
- "workdir", "onbuild"],
- instructionRegex = "(" + instructions.join('|') + ")",
- instructionOnlyLine = new RegExp(instructionRegex + "\\s*$", "i"),
- instructionWithArguments = new RegExp(instructionRegex + "(\\s+)", "i");
-
- CodeMirror.defineSimpleMode("dockerfile", {
- start: [
- // Block comment: This is a line starting with a comment
- {
- regex: /#.*$/,
- token: "comment"
- },
- // Highlight an instruction without any arguments (for convenience)
- {
- regex: instructionOnlyLine,
- token: "variable-2"
- },
- // Highlight an instruction followed by arguments
- {
- regex: instructionWithArguments,
- token: ["variable-2", null],
- next: "arguments"
- },
- {
- regex: /./,
- token: null
- }
- ],
- arguments: [
- {
- // Line comment without instruction arguments is an error
- regex: /#.*$/,
- token: "error",
- next: "start"
- },
- {
- regex: /[^#]+\\$/,
- token: null
- },
- {
- // Match everything except for the inline comment
- regex: /[^#]+/,
- token: null,
- next: "start"
- },
- {
- regex: /$/,
- token: null,
- next: "start"
- },
- // Fail safe return to start
- {
- token: null,
- next: "start"
- }
- ],
- meta: {
- lineComment: "#"
- }
- });
-
- CodeMirror.defineMIME("text/x-dockerfile", "dockerfile");
-});
diff --git a/js/codemirror-5.23.0/mode/ntriples/index.html b/js/codemirror-5.23.0/mode/ntriples/index.html
deleted file mode 100644
index 1355e71..0000000
--- a/js/codemirror-5.23.0/mode/ntriples/index.html
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
CodeMirror: NTriples mode
-
-
-
-
-
-
-
-
-
-
-NTriples mode
-
-
-
- MIME types defined: text/n-triples.
-
diff --git a/js/codemirror-5.23.0/mode/vb/index.html b/js/codemirror-5.23.0/mode/vb/index.html
deleted file mode 100644
index adcc44f..0000000
--- a/js/codemirror-5.23.0/mode/vb/index.html
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-CodeMirror: VB.NET mode
-
-
-
-
-
-
-
-
-
-
-
-
-VB.NET mode
-
-
-
-
-
-
-
- MIME type defined: text/x-vb.
-
-
diff --git a/js/codemirror-5.23.0/src/codemirror.js b/js/codemirror-5.23.0/src/codemirror.js
deleted file mode 100644
index 3c16cc8..0000000
--- a/js/codemirror-5.23.0/src/codemirror.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { CodeMirror } from "./edit/main"
-
-export default CodeMirror
diff --git a/js/codemirror-5.23.0/src/display/highlight_worker.js b/js/codemirror-5.23.0/src/display/highlight_worker.js
deleted file mode 100644
index d34db2b..0000000
--- a/js/codemirror-5.23.0/src/display/highlight_worker.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import { getStateBefore, highlightLine, processLine } from "../line/highlight"
-import { copyState } from "../modes"
-import { bind } from "../util/misc"
-
-import { runInOp } from "./operations"
-import { regLineChange } from "./view_tracking"
-
-// HIGHLIGHT WORKER
-
-export function startWorker(cm, time) {
- if (cm.doc.mode.startState && cm.doc.frontier < cm.display.viewTo)
- cm.state.highlight.set(time, bind(highlightWorker, cm))
-}
-
-function highlightWorker(cm) {
- let doc = cm.doc
- if (doc.frontier < doc.first) doc.frontier = doc.first
- if (doc.frontier >= cm.display.viewTo) return
- let end = +new Date + cm.options.workTime
- let state = copyState(doc.mode, getStateBefore(cm, doc.frontier))
- let changedLines = []
-
- doc.iter(doc.frontier, Math.min(doc.first + doc.size, cm.display.viewTo + 500), line => {
- if (doc.frontier >= cm.display.viewFrom) { // Visible
- let oldStyles = line.styles, tooLong = line.text.length > cm.options.maxHighlightLength
- let highlighted = highlightLine(cm, line, tooLong ? copyState(doc.mode, state) : state, true)
- line.styles = highlighted.styles
- let oldCls = line.styleClasses, newCls = highlighted.classes
- if (newCls) line.styleClasses = newCls
- else if (oldCls) line.styleClasses = null
- let ischange = !oldStyles || oldStyles.length != line.styles.length ||
- oldCls != newCls && (!oldCls || !newCls || oldCls.bgClass != newCls.bgClass || oldCls.textClass != newCls.textClass)
- for (let i = 0; !ischange && i < oldStyles.length; ++i) ischange = oldStyles[i] != line.styles[i]
- if (ischange) changedLines.push(doc.frontier)
- line.stateAfter = tooLong ? state : copyState(doc.mode, state)
- } else {
- if (line.text.length <= cm.options.maxHighlightLength)
- processLine(cm, line.text, state)
- line.stateAfter = doc.frontier % 5 == 0 ? copyState(doc.mode, state) : null
- }
- ++doc.frontier
- if (+new Date > end) {
- startWorker(cm, cm.options.workDelay)
- return true
- }
- })
- if (changedLines.length) runInOp(cm, () => {
- for (let i = 0; i < changedLines.length; i++)
- regLineChange(cm, changedLines[i], "text")
- })
-}
diff --git a/js/codemirror-5.23.0/src/display/scrolling.js b/js/codemirror-5.23.0/src/display/scrolling.js
deleted file mode 100644
index db9463c..0000000
--- a/js/codemirror-5.23.0/src/display/scrolling.js
+++ /dev/null
@@ -1,134 +0,0 @@
-import { Pos } from "../line/pos"
-import { cursorCoords, displayHeight, displayWidth, estimateCoords, paddingTop, paddingVert, scrollGap, textHeight } from "../measurement/position_measurement"
-import { phantom } from "../util/browser"
-import { elt } from "../util/dom"
-import { signalDOMEvent } from "../util/event"
-
-import { setScrollLeft, setScrollTop } from "./scroll_events"
-
-// SCROLLING THINGS INTO VIEW
-
-// If an editor sits on the top or bottom of the window, partially
-// scrolled out of view, this ensures that the cursor is visible.
-export function maybeScrollWindow(cm, coords) {
- if (signalDOMEvent(cm, "scrollCursorIntoView")) return
-
- let display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null
- if (coords.top + box.top < 0) doScroll = true
- else if (coords.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) doScroll = false
- if (doScroll != null && !phantom) {
- let scrollNode = elt("div", "\u200b", null, `position: absolute;
- top: ${coords.top - display.viewOffset - paddingTop(cm.display)}px;
- height: ${coords.bottom - coords.top + scrollGap(cm) + display.barHeight}px;
- left: ${coords.left}px; width: 2px;`)
- cm.display.lineSpace.appendChild(scrollNode)
- scrollNode.scrollIntoView(doScroll)
- cm.display.lineSpace.removeChild(scrollNode)
- }
-}
-
-// Scroll a given position into view (immediately), verifying that
-// it actually became visible (as line heights are accurately
-// measured, the position of something may 'drift' during drawing).
-export function scrollPosIntoView(cm, pos, end, margin) {
- if (margin == null) margin = 0
- let coords
- for (let limit = 0; limit < 5; limit++) {
- let changed = false
- coords = cursorCoords(cm, pos)
- let endCoords = !end || end == pos ? coords : cursorCoords(cm, end)
- let scrollPos = calculateScrollPos(cm, Math.min(coords.left, endCoords.left),
- Math.min(coords.top, endCoords.top) - margin,
- Math.max(coords.left, endCoords.left),
- Math.max(coords.bottom, endCoords.bottom) + margin)
- let startTop = cm.doc.scrollTop, startLeft = cm.doc.scrollLeft
- if (scrollPos.scrollTop != null) {
- setScrollTop(cm, scrollPos.scrollTop)
- if (Math.abs(cm.doc.scrollTop - startTop) > 1) changed = true
- }
- if (scrollPos.scrollLeft != null) {
- setScrollLeft(cm, scrollPos.scrollLeft)
- if (Math.abs(cm.doc.scrollLeft - startLeft) > 1) changed = true
- }
- if (!changed) break
- }
- return coords
-}
-
-// Scroll a given set of coordinates into view (immediately).
-export function scrollIntoView(cm, x1, y1, x2, y2) {
- let scrollPos = calculateScrollPos(cm, x1, y1, x2, y2)
- if (scrollPos.scrollTop != null) setScrollTop(cm, scrollPos.scrollTop)
- if (scrollPos.scrollLeft != null) setScrollLeft(cm, scrollPos.scrollLeft)
-}
-
-// Calculate a new scroll position needed to scroll the given
-// rectangle into view. Returns an object with scrollTop and
-// scrollLeft properties. When these are undefined, the
-// vertical/horizontal position does not need to be adjusted.
-export function calculateScrollPos(cm, x1, y1, x2, y2) {
- let display = cm.display, snapMargin = textHeight(cm.display)
- if (y1 < 0) y1 = 0
- let screentop = cm.curOp && cm.curOp.scrollTop != null ? cm.curOp.scrollTop : display.scroller.scrollTop
- let screen = displayHeight(cm), result = {}
- if (y2 - y1 > screen) y2 = y1 + screen
- let docBottom = cm.doc.height + paddingVert(display)
- let atTop = y1 < snapMargin, atBottom = y2 > docBottom - snapMargin
- if (y1 < screentop) {
- result.scrollTop = atTop ? 0 : y1
- } else if (y2 > screentop + screen) {
- let newTop = Math.min(y1, (atBottom ? docBottom : y2) - screen)
- if (newTop != screentop) result.scrollTop = newTop
- }
-
- let screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft
- let screenw = displayWidth(cm) - (cm.options.fixedGutter ? display.gutters.offsetWidth : 0)
- let tooWide = x2 - x1 > screenw
- if (tooWide) x2 = x1 + screenw
- if (x1 < 10)
- result.scrollLeft = 0
- else if (x1 < screenleft)
- result.scrollLeft = Math.max(0, x1 - (tooWide ? 0 : 10))
- else if (x2 > screenw + screenleft - 3)
- result.scrollLeft = x2 + (tooWide ? 0 : 10) - screenw
- return result
-}
-
-// Store a relative adjustment to the scroll position in the current
-// operation (to be applied when the operation finishes).
-export function addToScrollPos(cm, left, top) {
- if (left != null || top != null) resolveScrollToPos(cm)
- if (left != null)
- cm.curOp.scrollLeft = (cm.curOp.scrollLeft == null ? cm.doc.scrollLeft : cm.curOp.scrollLeft) + left
- if (top != null)
- cm.curOp.scrollTop = (cm.curOp.scrollTop == null ? cm.doc.scrollTop : cm.curOp.scrollTop) + top
-}
-
-// Make sure that at the end of the operation the current cursor is
-// shown.
-export function ensureCursorVisible(cm) {
- resolveScrollToPos(cm)
- let cur = cm.getCursor(), from = cur, to = cur
- if (!cm.options.lineWrapping) {
- from = cur.ch ? Pos(cur.line, cur.ch - 1) : cur
- to = Pos(cur.line, cur.ch + 1)
- }
- cm.curOp.scrollToPos = {from: from, to: to, margin: cm.options.cursorScrollMargin, isCursor: true}
-}
-
-// When an operation has its scrollToPos property set, and another
-// scroll action is applied before the end of the operation, this
-// 'simulates' scrolling that position into view in a cheap way, so
-// that the effect of intermediate scroll commands is not ignored.
-export function resolveScrollToPos(cm) {
- let range = cm.curOp.scrollToPos
- if (range) {
- cm.curOp.scrollToPos = null
- let from = estimateCoords(cm, range.from), to = estimateCoords(cm, range.to)
- let sPos = calculateScrollPos(cm, Math.min(from.left, to.left),
- Math.min(from.top, to.top) - range.margin,
- Math.max(from.right, to.right),
- Math.max(from.bottom, to.bottom) + range.margin)
- cm.scrollTo(sPos.scrollLeft, sPos.scrollTop)
- }
-}
diff --git a/js/codemirror-5.23.0/src/edit/mouse_events.js b/js/codemirror-5.23.0/src/edit/mouse_events.js
deleted file mode 100644
index 0b96f4c..0000000
--- a/js/codemirror-5.23.0/src/edit/mouse_events.js
+++ /dev/null
@@ -1,310 +0,0 @@
-import { delayBlurEvent, ensureFocus } from "../display/focus"
-import { operation } from "../display/operations"
-import { visibleLines } from "../display/update_lines"
-import { clipPos, cmp, maxPos, minPos, Pos } from "../line/pos"
-import { getLine, lineAtHeight } from "../line/utils_line"
-import { posFromMouse } from "../measurement/position_measurement"
-import { eventInWidget } from "../measurement/widgets"
-import { normalizeSelection, Range, Selection } from "../model/selection"
-import { extendRange, extendSelection, replaceOneSelection, setSelection } from "../model/selection_updates"
-import { captureRightClick, chromeOS, ie, ie_version, mac, webkit } from "../util/browser"
-import { activeElt } from "../util/dom"
-import { e_button, e_defaultPrevented, e_preventDefault, e_target, hasHandler, off, on, signal, signalDOMEvent } from "../util/event"
-import { dragAndDrop } from "../util/feature_detection"
-import { bind, countColumn, findColumn, sel_mouse } from "../util/misc"
-
-// A mouse down can be a single click, double click, triple click,
-// start of selection drag, start of text drag, new cursor
-// (ctrl-click), rectangle drag (alt-drag), or xwin
-// middle-click-paste. Or it might be a click on something we should
-// not interfere with, such as a scrollbar or widget.
-export function onMouseDown(e) {
- let cm = this, display = cm.display
- if (signalDOMEvent(cm, e) || display.activeTouch && display.input.supportsTouch()) return
- display.input.ensurePolled()
- display.shift = e.shiftKey
-
- if (eventInWidget(display, e)) {
- if (!webkit) {
- // Briefly turn off draggability, to allow widgets to do
- // normal dragging things.
- display.scroller.draggable = false
- setTimeout(() => display.scroller.draggable = true, 100)
- }
- return
- }
- if (clickInGutter(cm, e)) return
- let start = posFromMouse(cm, e)
- window.focus()
-
- switch (e_button(e)) {
- case 1:
- // #3261: make sure, that we're not starting a second selection
- if (cm.state.selectingText)
- cm.state.selectingText(e)
- else if (start)
- leftButtonDown(cm, e, start)
- else if (e_target(e) == display.scroller)
- e_preventDefault(e)
- break
- case 2:
- if (webkit) cm.state.lastMiddleDown = +new Date
- if (start) extendSelection(cm.doc, start)
- setTimeout(() => display.input.focus(), 20)
- e_preventDefault(e)
- break
- case 3:
- if (captureRightClick) onContextMenu(cm, e)
- else delayBlurEvent(cm)
- break
- }
-}
-
-let lastClick, lastDoubleClick
-function leftButtonDown(cm, e, start) {
- if (ie) setTimeout(bind(ensureFocus, cm), 0)
- else cm.curOp.focus = activeElt()
-
- let now = +new Date, type
- if (lastDoubleClick && lastDoubleClick.time > now - 400 && cmp(lastDoubleClick.pos, start) == 0) {
- type = "triple"
- } else if (lastClick && lastClick.time > now - 400 && cmp(lastClick.pos, start) == 0) {
- type = "double"
- lastDoubleClick = {time: now, pos: start}
- } else {
- type = "single"
- lastClick = {time: now, pos: start}
- }
-
- let sel = cm.doc.sel, modifier = mac ? e.metaKey : e.ctrlKey, contained
- if (cm.options.dragDrop && dragAndDrop && !cm.isReadOnly() &&
- type == "single" && (contained = sel.contains(start)) > -1 &&
- (cmp((contained = sel.ranges[contained]).from(), start) < 0 || start.xRel > 0) &&
- (cmp(contained.to(), start) > 0 || start.xRel < 0))
- leftButtonStartDrag(cm, e, start, modifier)
- else
- leftButtonSelect(cm, e, start, type, modifier)
-}
-
-// Start a text drag. When it ends, see if any dragging actually
-// happen, and treat as a click if it didn't.
-function leftButtonStartDrag(cm, e, start, modifier) {
- let display = cm.display, startTime = +new Date
- let dragEnd = operation(cm, e2 => {
- if (webkit) display.scroller.draggable = false
- cm.state.draggingText = false
- off(document, "mouseup", dragEnd)
- off(display.scroller, "drop", dragEnd)
- if (Math.abs(e.clientX - e2.clientX) + Math.abs(e.clientY - e2.clientY) < 10) {
- e_preventDefault(e2)
- if (!modifier && +new Date - 200 < startTime)
- extendSelection(cm.doc, start)
- // Work around unexplainable focus problem in IE9 (#2127) and Chrome (#3081)
- if (webkit || ie && ie_version == 9)
- setTimeout(() => {document.body.focus(); display.input.focus()}, 20)
- else
- display.input.focus()
- }
- })
- // Let the drag handler handle this.
- if (webkit) display.scroller.draggable = true
- cm.state.draggingText = dragEnd
- dragEnd.copy = mac ? e.altKey : e.ctrlKey
- // IE's approach to draggable
- if (display.scroller.dragDrop) display.scroller.dragDrop()
- on(document, "mouseup", dragEnd)
- on(display.scroller, "drop", dragEnd)
-}
-
-// Normal selection, as opposed to text dragging.
-function leftButtonSelect(cm, e, start, type, addNew) {
- let display = cm.display, doc = cm.doc
- e_preventDefault(e)
-
- let ourRange, ourIndex, startSel = doc.sel, ranges = startSel.ranges
- if (addNew && !e.shiftKey) {
- ourIndex = doc.sel.contains(start)
- if (ourIndex > -1)
- ourRange = ranges[ourIndex]
- else
- ourRange = new Range(start, start)
- } else {
- ourRange = doc.sel.primary()
- ourIndex = doc.sel.primIndex
- }
-
- if (chromeOS ? e.shiftKey && e.metaKey : e.altKey) {
- type = "rect"
- if (!addNew) ourRange = new Range(start, start)
- start = posFromMouse(cm, e, true, true)
- ourIndex = -1
- } else if (type == "double") {
- let word = cm.findWordAt(start)
- if (cm.display.shift || doc.extend)
- ourRange = extendRange(doc, ourRange, word.anchor, word.head)
- else
- ourRange = word
- } else if (type == "triple") {
- let line = new Range(Pos(start.line, 0), clipPos(doc, Pos(start.line + 1, 0)))
- if (cm.display.shift || doc.extend)
- ourRange = extendRange(doc, ourRange, line.anchor, line.head)
- else
- ourRange = line
- } else {
- ourRange = extendRange(doc, ourRange, start)
- }
-
- if (!addNew) {
- ourIndex = 0
- setSelection(doc, new Selection([ourRange], 0), sel_mouse)
- startSel = doc.sel
- } else if (ourIndex == -1) {
- ourIndex = ranges.length
- setSelection(doc, normalizeSelection(ranges.concat([ourRange]), ourIndex),
- {scroll: false, origin: "*mouse"})
- } else if (ranges.length > 1 && ranges[ourIndex].empty() && type == "single" && !e.shiftKey) {
- setSelection(doc, normalizeSelection(ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0),
- {scroll: false, origin: "*mouse"})
- startSel = doc.sel
- } else {
- replaceOneSelection(doc, ourIndex, ourRange, sel_mouse)
- }
-
- let lastPos = start
- function extendTo(pos) {
- if (cmp(lastPos, pos) == 0) return
- lastPos = pos
-
- if (type == "rect") {
- let ranges = [], tabSize = cm.options.tabSize
- let startCol = countColumn(getLine(doc, start.line).text, start.ch, tabSize)
- let posCol = countColumn(getLine(doc, pos.line).text, pos.ch, tabSize)
- let left = Math.min(startCol, posCol), right = Math.max(startCol, posCol)
- for (let line = Math.min(start.line, pos.line), end = Math.min(cm.lastLine(), Math.max(start.line, pos.line));
- line <= end; line++) {
- let text = getLine(doc, line).text, leftPos = findColumn(text, left, tabSize)
- if (left == right)
- ranges.push(new Range(Pos(line, leftPos), Pos(line, leftPos)))
- else if (text.length > leftPos)
- ranges.push(new Range(Pos(line, leftPos), Pos(line, findColumn(text, right, tabSize))))
- }
- if (!ranges.length) ranges.push(new Range(start, start))
- setSelection(doc, normalizeSelection(startSel.ranges.slice(0, ourIndex).concat(ranges), ourIndex),
- {origin: "*mouse", scroll: false})
- cm.scrollIntoView(pos)
- } else {
- let oldRange = ourRange
- let anchor = oldRange.anchor, head = pos
- if (type != "single") {
- let range
- if (type == "double")
- range = cm.findWordAt(pos)
- else
- range = new Range(Pos(pos.line, 0), clipPos(doc, Pos(pos.line + 1, 0)))
- if (cmp(range.anchor, anchor) > 0) {
- head = range.head
- anchor = minPos(oldRange.from(), range.anchor)
- } else {
- head = range.anchor
- anchor = maxPos(oldRange.to(), range.head)
- }
- }
- let ranges = startSel.ranges.slice(0)
- ranges[ourIndex] = new Range(clipPos(doc, anchor), head)
- setSelection(doc, normalizeSelection(ranges, ourIndex), sel_mouse)
- }
- }
-
- let editorSize = display.wrapper.getBoundingClientRect()
- // Used to ensure timeout re-tries don't fire when another extend
- // happened in the meantime (clearTimeout isn't reliable -- at
- // least on Chrome, the timeouts still happen even when cleared,
- // if the clear happens after their scheduled firing time).
- let counter = 0
-
- function extend(e) {
- let curCount = ++counter
- let cur = posFromMouse(cm, e, true, type == "rect")
- if (!cur) return
- if (cmp(cur, lastPos) != 0) {
- cm.curOp.focus = activeElt()
- extendTo(cur)
- let visible = visibleLines(display, doc)
- if (cur.line >= visible.to || cur.line < visible.from)
- setTimeout(operation(cm, () => {if (counter == curCount) extend(e)}), 150)
- } else {
- let outside = e.clientY < editorSize.top ? -20 : e.clientY > editorSize.bottom ? 20 : 0
- if (outside) setTimeout(operation(cm, () => {
- if (counter != curCount) return
- display.scroller.scrollTop += outside
- extend(e)
- }), 50)
- }
- }
-
- function done(e) {
- cm.state.selectingText = false
- counter = Infinity
- e_preventDefault(e)
- display.input.focus()
- off(document, "mousemove", move)
- off(document, "mouseup", up)
- doc.history.lastSelOrigin = null
- }
-
- let move = operation(cm, e => {
- if (!e_button(e)) done(e)
- else extend(e)
- })
- let up = operation(cm, done)
- cm.state.selectingText = up
- on(document, "mousemove", move)
- on(document, "mouseup", up)
-}
-
-
-// Determines whether an event happened in the gutter, and fires the
-// handlers for the corresponding event.
-function gutterEvent(cm, e, type, prevent) {
- let mX, mY
- try { mX = e.clientX; mY = e.clientY }
- catch(e) { return false }
- if (mX >= Math.floor(cm.display.gutters.getBoundingClientRect().right)) return false
- if (prevent) e_preventDefault(e)
-
- let display = cm.display
- let lineBox = display.lineDiv.getBoundingClientRect()
-
- if (mY > lineBox.bottom || !hasHandler(cm, type)) return e_defaultPrevented(e)
- mY -= lineBox.top - display.viewOffset
-
- for (let i = 0; i < cm.options.gutters.length; ++i) {
- let g = display.gutters.childNodes[i]
- if (g && g.getBoundingClientRect().right >= mX) {
- let line = lineAtHeight(cm.doc, mY)
- let gutter = cm.options.gutters[i]
- signal(cm, type, cm, line, gutter, e)
- return e_defaultPrevented(e)
- }
- }
-}
-
-export function clickInGutter(cm, e) {
- return gutterEvent(cm, e, "gutterClick", true)
-}
-
-// CONTEXT MENU HANDLING
-
-// To make the context menu work, we need to briefly unhide the
-// textarea (making it as unobtrusive as possible) to let the
-// right-click take effect on it.
-export function onContextMenu(cm, e) {
- if (eventInWidget(cm.display, e) || contextMenuInGutter(cm, e)) return
- if (signalDOMEvent(cm, e, "contextmenu")) return
- cm.display.input.onContextMenu(e)
-}
-
-function contextMenuInGutter(cm, e) {
- if (!hasHandler(cm, "gutterContextMenu")) return false
- return gutterEvent(cm, e, "gutterContextMenu", false)
-}
diff --git a/js/codemirror-5.23.0/src/model/line_widget.js b/js/codemirror-5.23.0/src/model/line_widget.js
deleted file mode 100644
index e832e8c..0000000
--- a/js/codemirror-5.23.0/src/model/line_widget.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import { runInOp } from "../display/operations"
-import { addToScrollPos } from "../display/scrolling"
-import { regLineChange } from "../display/view_tracking"
-import { heightAtLine, lineIsHidden } from "../line/spans"
-import { lineNo, updateLineHeight } from "../line/utils_line"
-import { widgetHeight } from "../measurement/widgets"
-import { changeLine } from "./changes"
-import { eventMixin } from "../util/event"
-
-// Line widgets are block elements displayed above or below a line.
-
-export function LineWidget(doc, node, options) {
- if (options) for (let opt in options) if (options.hasOwnProperty(opt))
- this[opt] = options[opt]
- this.doc = doc
- this.node = node
-}
-eventMixin(LineWidget)
-
-function adjustScrollWhenAboveVisible(cm, line, diff) {
- if (heightAtLine(line) < ((cm.curOp && cm.curOp.scrollTop) || cm.doc.scrollTop))
- addToScrollPos(cm, null, diff)
-}
-
-LineWidget.prototype.clear = function() {
- let cm = this.doc.cm, ws = this.line.widgets, line = this.line, no = lineNo(line)
- if (no == null || !ws) return
- for (let i = 0; i < ws.length; ++i) if (ws[i] == this) ws.splice(i--, 1)
- if (!ws.length) line.widgets = null
- let height = widgetHeight(this)
- updateLineHeight(line, Math.max(0, line.height - height))
- if (cm) runInOp(cm, () => {
- adjustScrollWhenAboveVisible(cm, line, -height)
- regLineChange(cm, no, "widget")
- })
-}
-LineWidget.prototype.changed = function() {
- let oldH = this.height, cm = this.doc.cm, line = this.line
- this.height = null
- let diff = widgetHeight(this) - oldH
- if (!diff) return
- updateLineHeight(line, line.height + diff)
- if (cm) runInOp(cm, () => {
- cm.curOp.forceUpdate = true
- adjustScrollWhenAboveVisible(cm, line, diff)
- })
-}
-
-export function addLineWidget(doc, handle, node, options) {
- let widget = new LineWidget(doc, node, options)
- let cm = doc.cm
- if (cm && widget.noHScroll) cm.display.alignWidgets = true
- changeLine(doc, handle, "widget", line => {
- let widgets = line.widgets || (line.widgets = [])
- if (widget.insertAt == null) widgets.push(widget)
- else widgets.splice(Math.min(widgets.length - 1, Math.max(0, widget.insertAt)), 0, widget)
- widget.line = line
- if (cm && !lineIsHidden(doc, line)) {
- let aboveVisible = heightAtLine(line) < doc.scrollTop
- updateLineHeight(line, line.height + widgetHeight(widget))
- if (aboveVisible) addToScrollPos(cm, null, widget.height)
- cm.curOp.forceUpdate = true
- }
- return true
- })
- return widget
-}
diff --git a/js/codemirror-5.23.0/test/search_test.js b/js/codemirror-5.23.0/test/search_test.js
deleted file mode 100644
index 04a1e68..0000000
--- a/js/codemirror-5.23.0/test/search_test.js
+++ /dev/null
@@ -1,62 +0,0 @@
-(function() {
- "use strict";
-
- function test(name) {
- var text = Array.prototype.slice.call(arguments, 1, arguments.length - 1).join("\n");
- var body = arguments[arguments.length - 1];
- return window.test("search_" + name, function() {
- body(new CodeMirror.Doc(text));
- });
- }
-
- function run(doc, query, insensitive) {
- var cursor = doc.getSearchCursor(query, null, insensitive);
- for (var i = 3; i < arguments.length; i += 4) {
- var found = cursor.findNext();
- is(found, "not enough results (forward)");
- eqPos(Pos(arguments[i], arguments[i + 1]), cursor.from(), "from, forward, " + (i - 3) / 4);
- eqPos(Pos(arguments[i + 2], arguments[i + 3]), cursor.to(), "to, forward, " + (i - 3) / 4);
- }
- is(!cursor.findNext(), "too many matches (forward)");
- for (var i = arguments.length - 4; i >= 3; i -= 4) {
- var found = cursor.findPrevious();
- is(found, "not enough results (backwards)");
- eqPos(Pos(arguments[i], arguments[i + 1]), cursor.from(), "from, backwards, " + (i - 3) / 4);
- eqPos(Pos(arguments[i + 2], arguments[i + 3]), cursor.to(), "to, backwards, " + (i - 3) / 4);
- }
- is(!cursor.findPrevious(), "too many matches (backwards)");
- }
-
- test("simple", "abcdefg", "abcdefg", function(doc) {
- run(doc, "cde", false, 0, 2, 0, 5, 1, 2, 1, 5);
- });
-
- test("multiline", "hallo", "goodbye", function(doc) {
- run(doc, "llo\ngoo", false, 0, 2, 1, 3);
- run(doc, "blah\nhall", false);
- run(doc, "bye\neye", false);
- });
-
- test("regexp", "abcde", "abcde", function(doc) {
- run(doc, /bcd/, false, 0, 1, 0, 4, 1, 1, 1, 4);
- run(doc, /BCD/, false);
- run(doc, /BCD/i, false, 0, 1, 0, 4, 1, 1, 1, 4);
- });
-
- test("insensitive", "hallo", "HALLO", "oink", "hAllO", function(doc) {
- run(doc, "All", false, 3, 1, 3, 4);
- run(doc, "All", true, 0, 1, 0, 4, 1, 1, 1, 4, 3, 1, 3, 4);
- });
-
- test("multilineInsensitive", "zie ginds komT", "De Stoomboot", "uit Spanje weer aan", function(doc) {
- run(doc, "komt\nde stoomboot\nuit", false);
- run(doc, "komt\nde stoomboot\nuit", true, 0, 10, 2, 3);
- run(doc, "kOMt\ndE stOOmboot\nuiT", true, 0, 10, 2, 3);
- });
-
- test("expandingCaseFold", "İİ İİ ", "uu uu ", function(doc) {
- if (phantom) return; // A Phantom bug makes this hang
- run(doc, "", true, 0, 8, 0, 12, 1, 8, 1, 12);
- run(doc, "İİ", true, 0, 3, 0, 5, 0, 6, 0, 8);
- });
-})();
diff --git a/js/codemirror-5.39.0/.editorconfig b/js/codemirror-5.39.0/.editorconfig
new file mode 100644
index 0000000..7ed0206
--- /dev/null
+++ b/js/codemirror-5.39.0/.editorconfig
@@ -0,0 +1,7 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
diff --git a/js/codemirror-5.39.0/.gitattributes b/js/codemirror-5.39.0/.gitattributes
new file mode 100644
index 0000000..1c8c82d
--- /dev/null
+++ b/js/codemirror-5.39.0/.gitattributes
@@ -0,0 +1,8 @@
+*.txt text eol=lf
+*.js text eol=lf
+*.html text eol=lf
+*.md text eol=lf
+*.json text eol=lf
+*.yml text eol=lf
+*.css text eol=lf
+*.svg text eol=lf
diff --git a/js/codemirror-5.39.0/.gitignore b/js/codemirror-5.39.0/.gitignore
new file mode 100644
index 0000000..01019cf
--- /dev/null
+++ b/js/codemirror-5.39.0/.gitignore
@@ -0,0 +1,9 @@
+/node_modules
+/npm-debug.log
+/test*.html
+.tern-*
+*~
+*.swp
+.idea
+*.iml
+/lib/codemirror.js
diff --git a/js/codemirror-5.23.0/.npmignore b/js/codemirror-5.39.0/.npmignore
similarity index 100%
rename from js/codemirror-5.23.0/.npmignore
rename to js/codemirror-5.39.0/.npmignore
diff --git a/js/codemirror-5.23.0/.travis.yml b/js/codemirror-5.39.0/.travis.yml
similarity index 100%
rename from js/codemirror-5.23.0/.travis.yml
rename to js/codemirror-5.39.0/.travis.yml
diff --git a/js/codemirror-5.23.0/AUTHORS b/js/codemirror-5.39.0/AUTHORS
similarity index 83%
rename from js/codemirror-5.23.0/AUTHORS
rename to js/codemirror-5.39.0/AUTHORS
index 866c78f..52f2b9f 100644
--- a/js/codemirror-5.23.0/AUTHORS
+++ b/js/codemirror-5.39.0/AUTHORS
@@ -1,11 +1,13 @@
List of CodeMirror contributors. Updated before every release.
+4oo4
4r2r
Aaron Brooks
Abdelouahab
Abe Fettig
Adam Ahmed
Adam King
+Adam Particka
adanlobato
Adán Lobato
Adrian Aichner
@@ -17,6 +19,7 @@ Ahmad M. Zawawi
ahoward
Akeksandr Motsjonov
Alasdair Smith
+AlbertHilb
Alberto González Palomo
Alberto Pose
Albert Xing
@@ -29,6 +32,7 @@ alexey-k
Alex Piggott
Aliaksei Chapyzhenka
Allen Sarkisyan
+Ami Fischman
Amin Shali
Amin Ullah Khan
amshali@google.com
@@ -46,6 +50,7 @@ Andreas Reischuck
Andres Taylor
Andre von Houck
Andrew Cheng
+Andrew Dassonville
Andrey Fedorov
Andrey Klyuchnikov
Andrey Lushnikov
@@ -66,13 +71,19 @@ Anthony Grimes
Anton Kovalyov
Apollo Zhu
AQNOUCH Mohammed
+Aram Shatakhtsyan
areos
Arnab Bose
+Arsène von Wyss
+Arthur Müller
+Arun Narasani
as3boyan
+asolove
atelierbram
AtomicPages LLC
Atul Bhouraskar
Aurelian Oancea
+Axel Lewenhaupt
Barret Rennie
Basarat Ali Syed
Bastian Müller
@@ -81,6 +92,7 @@ Bem Jones-Bey
benbro
Beni Cherniavsky-Paskin
Benjamin DeCoste
+Benjamin Young
Ben Keen
Ben Miller
Ben Mosher
@@ -90,22 +102,30 @@ Bharad
BigBlueHat
Billy Moon
binny
+Bjorn Hansen
B Krishna Chaitanya
Blaine G
blukat29
+Bo
boomyjee
+Bo Peng
borawjm
Brad Metcalf
Brandon Frohs
Brandon Wamboldt
+Bret Little
Brett Zamir
Brian Grinstead
Brian Sletten
+brrd
Bruce Mitchener
+Bryan Massoth
Caitlin Potter
Calin Barbat
callodacity
Camilo Roca
+Casey Klebba
+César González Íñiguez
Chad Jolly
Chandra Sekhar Pydi
Charles Skelton
@@ -116,18 +136,24 @@ Chris Granger
Chris Houseknecht
Chris Lohfink
Chris Morgan
+Chris Reeves
Chris Smith
+Christian Gruen
Christian Oyarzun
Christian Petrov
+christopherblaser
Christopher Brown
+Christopher Kramer
Christopher Mitchell
Christopher Pfohl
Chunliang Lyu
ciaranj
CodeAnimal
+CodeBitt
coderaiser
Cole R Lawrence
ComFreek
+Cristian Prieto
Curtis Gagliardi
dagsta
daines
@@ -142,6 +168,8 @@ Daniel Kesler
Daniel KJ
Daniel Neel
Daniel Parnell
+Daniel Thwaites
+Danila Malyutin
Danny Yoo
darealshinji
Darius Roberts
@@ -171,6 +199,7 @@ Drew Khoury
Drini Cami
Dror BG
duralog
+dwelle
eborden
edsharp
ekhaled
@@ -178,8 +207,10 @@ Elisée
Emmanuel Schanzer
Enam Mijbah Noor
Eric Allam
+Eric Bogard
Erik Welander
eustas
+Fabien Dubosson
Fabien O'Carroll
Fabio Zendhi Nagao
Faiza Alsaied
@@ -191,12 +222,16 @@ Felix Raab
ficristo
Filip Noetzel
Filip Stollár
+Filype Pereira
flack
+Florian Felten
ForbesLindesay
Forbes Lindesay
Ford_Lawnmower
Forrest Oliphant
+Franco Catena
Frank Wiegand
+Fredrik Borg
Gabriel Gheorghian
Gabriel Horner
Gabriel Nahmias
@@ -205,6 +240,8 @@ Gary Sheng
Gautam Mehta
Gavin Douglas
gekkoe
+Geordie Hall
+George Stephanis
geowarin
Gerard Braad
Gergely Hegykozi
@@ -212,6 +249,7 @@ Giovanni Calò
Glebov Boris
Glenn Jorde
Glenn Ruehle
+goldsmcb
Golevka
Google Inc.
Gordon Smith
@@ -219,6 +257,7 @@ Grant Skinner
greengiant
Gregory Koberger
Grzegorz Mazur
+Guan Gui
Guillaume Massé
Guillaume Massé
guraga
@@ -228,15 +267,21 @@ Hans Engel
Hardest
Harshvardhan Gupta
Hasan Karahan
+Heanes
Hector Oswaldo Caballero
+Hélio
Hendrik Wallbaum
+Henrik Haugbølle
Herculano Campos
+hidaiy
Hiroyuki Makino
hitsthings
Hocdoc
Hugues Malphettes
Ian Beck
+Ian Davies
Ian Dickinson
+Ian Rose
Ian Wehrman
Ian Wetherbee
Ice White
@@ -248,6 +293,7 @@ Irakli Gozalishvili
Ivan Kurnosov
Ivoah
Jacob Lee
+Jaimin
Jake Peyser
Jakob Miland
Jakub Vrana
@@ -256,6 +302,7 @@ James Campos
James Howard
James Thorne
Jamie Hill
+Jamie Morris
Jan Jongboom
jankeromnes
Jan Keromnes
@@ -271,9 +318,11 @@ Jason Grout
Jason Johnston
Jason San Jose
Jason Siefken
+Jayaprabhakar
Jaydeep Solanki
Jean Boussier
Jeff Blaisdell
+Jeff Hanke
Jeff Jenkins
jeffkenton
Jeff Pickhardt
@@ -281,6 +330,7 @@ jem (graphite)
Jeremy Parmenter
Jim
Jim Avery
+jkaplon
JobJob
jochenberger
Jochen Berger
@@ -295,6 +345,8 @@ John Snelson
John Van Der Loo
Jon Ander Peñalba
Jonas Döbertin
+Jonas Helfer
+Jonathan Hart
Jonathan Malmaud
Jon Gacnik
jongalloway
@@ -302,6 +354,7 @@ Jon Malmaud
Jon Sangster
Joost-Wim Boekesteijn
Joseph Pecoraro
+Josh Barnes
Josh Cohen
Josh Soref
Joshua Newman
@@ -312,18 +365,22 @@ ju1ius
Juan Benavides Romero
Jucovschi Constantin
Juho Vuori
+Julien CROUZET
Julien Rebetez
Justin Andresen
Justin Hileman
jwallers@gmail.com
kaniga
karevn
+Karol
Kayur Patel
Kazuhito Hokamura
Ken Newman
ken restivo
Ken Rockot
Kevin Earls
+Kevin Kwok
+Kevin Muret
Kevin Sawicki
Kevin Ushey
Klaus Silveira
@@ -336,19 +393,26 @@ ks-ifware
kubelsmieci
KwanEsq
Kyle Kelley
+KyleMcNutt
Lanfei
Lanny
+laobubu
Laszlo Vidacs
leaf corcoran
+Lemmon
Leonid Khachaturov
Leon Sorokin
Leonya Khachaturov
Liam Newman
Libo Cannici
+Lior Goldberg
+Lior Shub
LloydMilligan
LM
lochel
Lorenzo Stoakes
+Louis Mauchet
+Luca Fabbri
Luciano Longo
Lu Fangjian
Luke Browning
@@ -377,6 +441,7 @@ Mark Lentczner
Marko Bonaci
Mark Peace
Markus Bordihn
+Markus Olsson
Martin Balek
Martín Gaitán
Martin Hasoň
@@ -394,6 +459,7 @@ matthewhayes
Matthew Rathbone
Matthias Bussonnier
Matthias BUSSONNIER
+Matt MacPherson
Matt McDonald
Matt Pass
Matt Sacks
@@ -405,7 +471,9 @@ Max Schaefer
Max Xiantu
mbarkhau
McBrainy
+mce2
melpon
+meshuamam
Metatheos
Micah Dubinko
Michael
@@ -413,8 +481,11 @@ Michael Goderbauer
Michael Grey
Michael Kaminsky
Michael Lehenbauer
+Michael Walker
Michael Zhou
+Michal Čihař
Michal Dorner
+Michal Kapiczynski
Mighty Guava
Miguel Castillo
mihailik
@@ -424,28 +495,38 @@ Mike Diaz
Mike Ivanov
Mike Kadin
Mike Kobit
+Milan Szekely
MinRK
Miraculix87
misfo
mkaminsky11
mloginov
+Moritz Schubotz (physikerwelt)
Moritz Schwörer
+Moshe Wajnberg
mps
ms
mtaran-google
Mu-An Chiou
+Mu-An ✌️ Chiou
+mzabuawala
Narciso Jaramillo
Nathan Williams
ndr
+Neil Anderson
+neon-dev
nerbert
+NetworkNode
nextrevision
ngn
nguillaumin
Ng Zhi An
Nicholas Bollweg
Nicholas Bollweg (Nick)
+NickKolok
Nick Kreeger
Nick Small
+Nicolas Kick
Nicolò Ribaudo
Niels van Groningen
nightwing
@@ -457,11 +538,16 @@ Nisarg Jhaveri
nlwillia
noragrossman
Norman Rzepka
+opl-
Oreoluwa Onatemowo
Oskar Segersvärd
+overdodactyl
pablo
pabloferz
+Pablo Zubieta
+paddya
Page
+paladox
Panupong Pasupat
paris
Paris
@@ -484,12 +570,15 @@ peterkroon
Peter Kroon
Philipp A
Philip Stadermann
+Pi Delport
Pierre Gerold
-Piët Delport
+Pieter Ouwerkerk
Pontus Melke
prasanthj
Prasanth J
Prayag Verma
+Prendota
+Qiang Li
Radek Piórkowski
Rahul
Rahul Anand
@@ -497,62 +586,83 @@ ramwin1
Randall Mason
Randy Burden
Randy Edmunds
+Randy Luecke
+Raphael Amorim
Rasmus Erik Voel Jensen
+Rasmus Schultz
+Raymond Hill
ray ratchup
Ray Ratchup
Remi Nyborg
+Renaud Durlin
+Reynold Xin
Richard Denton
Richard van der Meer
Richard Z.H. Wang
Rishi Goomar
+Robert Brignull
Robert Crossfield
Roberto Abdelkader Martínez Pérez
robertop23
Robert Plummer
Rrandom
+Rrrandom
Ruslan Osmanov
+Ryan Petrello
Ryan Prior
+ryu-sato
sabaca
Sam Lee
+Sam Rawlins
Samuel Ainsworth
Sam Wilson
sandeepshetty
Sander AKA Redsandro
Sander Verweij
santec
+Sarah McAlear and Wenlin Zhang
Sascha Peilicke
satamas
satchmorun
sathyamoorthi
+Saul Costa
S. Chris Colbert
SCLINIC\jdecker
Scott Aikin
Scott Goodhew
+Sebastian Wilzbach
Sebastian Zaha
Sergey Goder
Sergey Tselovalnikov
Se-Won Kim
+Shane Liesegang
shaund
shaun gilchrist
Shawn A
Shea Bunge
sheopory
+Shil S
Shiv Deepak
Shmuel Englard
Shubham Jain
Siamak Mokhtari
silverwind
+Simon Edwards
sinkuu
snasa
soliton4
sonson
+Sorab Bisht
spastorelli
srajanpaliwal
Stanislav Oaserele
+stan-z
Stas Kobzar
Stefan Borsje
Steffen Beyer
Steffen Bruchmann
+Steffen Kowalski
+Stephane Moore
Stephen Lavelle
Steve Champagne
Steve Hoover
@@ -565,15 +675,18 @@ Taha Jahangir
takamori
Tako Schotanus
Takuji Shimokawa
+Takuya Matsuyama
Tarmil
TDaglis
tel
+Tentone
tfjgeorge
Thaddee Tyl
thanasis
TheHowl
themrmax
think
+Thomas Brouard
Thomas Dvornik
Thomas Kluyver
Thomas Schmid
@@ -582,44 +695,58 @@ Tim Baumann
Timothy Farrell
Timothy Gu
Timothy Hatcher
+Tobias Bertelsen
TobiasBg
Todd Berman
+Todd Kennedy
Tomas-A
Tomas Varaneckas
Tom Erik Støwer
Tom Klancer
Tom MacWright
+Tom McLaughlin
Tony Jian
+tophf
+totalamd
Travis Heppe
Triangle717
Tristan Tarrant
TSUYUSATO Kitsune
+Tugrul Elmas
twifkak
+Tyler Long
+Vadzim Ramanenka
+Vaibhav Sagar
VapidWorx
Vestimir Markov
vf
Victor Bocharsky
Vincent Woo
Volker Mische
+vtripolitakis
Weiyan Shao
wenli
Wes Cossick
Wesley Wiser
+Weston Ruter
Will Binns-Smith
Will Dean
William Jamieson
William Stein
Willy
Wojtek Ptak
+wonderboyjon
Wu Cheng-Han
Xavier Mendez
Yassin N. Hassan
YNH Webdev
Yunchi Luo
Yuvi Panda
+Yvonnick Esnault
Zac Anger
Zachary Dremann
Zeno Rocha
Zhang Hao
+Ziv
zziuni
魏鹏刚
diff --git a/js/codemirror-5.23.0/CHANGELOG.md b/js/codemirror-5.39.0/CHANGELOG.md
similarity index 76%
rename from js/codemirror-5.23.0/CHANGELOG.md
rename to js/codemirror-5.39.0/CHANGELOG.md
index 07ed029..75b0de9 100644
--- a/js/codemirror-5.23.0/CHANGELOG.md
+++ b/js/codemirror-5.39.0/CHANGELOG.md
@@ -1,3 +1,443 @@
+## 5.39.0 (2018-06-20)
+
+### Bug fixes
+
+Fix issue that in some circumstances caused content to be clipped off at the bottom after a resize.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Improve handling of blank lines in HTML tags.
+
+### New features
+
+[stex mode](http://codemirror.net/mode/stex/): Add an `inMathMode` option to start the mode in math mode.
+
+## 5.38.0 (2018-05-21)
+
+### Bug fixes
+
+Improve reliability of noticing a missing mouseup event during dragging.
+
+Make sure `getSelection` is always called on the correct document.
+
+Fix interpretation of line breaks and non-breaking spaces inserted by renderer in contentEditable mode.
+
+Work around some browsers inexplicably making the fake scrollbars focusable.
+
+Make sure `coordsChar` doesn't return positions inside collapsed ranges.
+
+[javascript mode](http://codemirror.net/mode/javascript/): Support block scopes, bindingless catch, bignum suffix, `s` regexp flag.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Adjust a wasteful regexp.
+
+[show-hint addon](http://codemirror.net/doc/manual.html#addon_show-hint): Allow opening the control without any item selected.
+
+### New features
+
+New theme: [darcula](http://codemirror.net/demo/theme.html#darcula).
+
+[dialog addon](http://codemirror.net/doc/manual.html#addon_dialog): Add a CSS class (`dialog-opened`) to the editor when a dialog is open.
+
+## 5.37.0 (2018-04-20)
+
+### Bug fixes
+
+Suppress keypress events during composition, for platforms that don't properly do this themselves.
+
+[xml-fold addon](http://codemirror.net/demo/folding.html): Improve handling of line-wrapped opening tags.
+
+[javascript mode](http://codemirror.net/mode/javascript/): Improve TypeScript support.
+
+[python mode](http://codemirror.net/mode/python/): Highlight expressions inside format strings.
+
+### New features
+
+[vim bindings](http://codemirror.net/demo/vim.html): Add support for '(' and ')' movement.
+
+New themes: [idea](http://codemirror.net/demo/theme.html#idea), [ssms](http://codemirror.net/demo/theme.html#ssms), [gruvbox-dark](http://codemirror.net/demo/theme.html#gruvbox-dark).
+
+## 5.36.0 (2018-03-20)
+
+### Bug fixes
+
+Make sure all document-level event handlers are registered on the document that the editor is part of.
+
+Fix issue that prevented edits whose origin starts with `+` from being combined in history events for an editor-less document.
+
+[multiplex addon](http://codemirror.net/demo/multiplex.html): Improve handling of indentation.
+
+[merge addon](http://codemirror.net/doc/manual.html#addon_merge): Use CSS `:after` element to style the scroll-lock icon.
+
+[javascript-hint addon](http://codemirror.net/doc/manual.html#addon_javascript-hint): Don't provide completions in JSON mode.
+
+[continuelist addon](http://codemirror.net/doc/manual.html#addon_continuelist): Fix numbering error.
+
+[show-hint addon](http://codemirror.net/doc/manual.html#addon_show-hint): Make `fromList` completion strategy act on the current token up to the cursor, rather than the entire token.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Fix a regexp with potentially exponental complexity.
+
+### New features
+
+New theme: [lucario](http://codemirror.net/demo/theme.html#lucario).
+
+## 5.35.0 (2018-02-20)
+
+### Bug fixes
+
+Fix problem where selection undo might change read-only documents.
+
+Fix crash when calling `addLineWidget` on a document that has no attached editor.
+
+[searchcursor addon](http://codemirror.net/doc/manual.html#addon_searchcursor): Fix behavior of `^` in multiline regexp mode.
+
+[match-highlighter addon](http://codemirror.net/doc/manual.html#addon_match-highlighter): Fix problem with matching words that have regexp special syntax in them.
+
+[sublime bindings](http://codemirror.net/demo/sublime.html): Fix `addCursorToSelection` for short lines.
+
+[javascript mode](http://codemirror.net/mode/javascript/): Support TypeScript intersection types, dynamic `import`.
+
+[stex mode](http://codemirror.net/mode/stex/): Fix parsing of `\(` `\)` delimiters, recognize more atom arguments.
+
+[haskell mode](http://codemirror.net/mode/haskell/): Highlight more builtins, support `<*` and `*>`.
+
+[sql mode](http://codemirror.net/mode/sql/): Make it possible to disable backslash escapes in strings for dialects that don't have them, do this for MS SQL.
+
+[dockerfile mode](http://codemirror.net/mode/dockerfile/): Highlight strings and ports, recognize more instructions.
+
+### New features
+
+[vim bindings](http://codemirror.net/demo/vim.html): Support alternative delimiters in replace command.
+
+## 5.34.0 (2018-01-29)
+
+### Bug fixes
+
+[markdown mode](http://codemirror.net/mode/markdown/): Fix a problem where inline styles would persist across list items.
+
+[sublime bindings](http://codemirror.net/demo/sublime.html): Fix the `toggleBookmark` command.
+
+[closebrackets addon](http://codemirror.net/doc/manual.html#addon_closebrackets): Improve behavior when closing triple quotes.
+
+[xml-fold addon](http://codemirror.net/demo/folding.html): Fix folding of line-broken XML tags.
+
+[shell mode](http://codemirror.net/mode/shell/): Better handling of nested quoting.
+
+[javascript-lint addon](http://codemirror.net/demo/lint.html): Clean up and simplify.
+
+[matchbrackets addon](http://codemirror.net/doc/manual.html#addon_matchbrackets): Fix support for multiple editors at the same time.
+
+### New features
+
+New themes: [oceanic-next](http://codemirror.net/demo/theme.html#oceanic-next) and [shadowfox](http://codemirror.net/demo/theme.html#shadowfox).
+
+## 5.33.0 (2017-12-21)
+
+### Bug fixes
+
+[lint addon](http://codemirror.net/doc/manual.html#addon_lint): Make updates more efficient.
+
+[css mode](http://codemirror.net/mode/css/): The mode is now properly case-insensitive.
+
+[continuelist addon](http://codemirror.net/doc/manual.html#addon_continuelist): Fix broken handling of unordered lists introduced in previous release.
+
+[swift](http://codemirror.net/mode/swift) and [scala](http://codemirror.net/mode/clike/) modes: Support nested block comments.
+
+[mllike mode](http://codemirror.net/mode/mllike/index.html): Improve OCaml support.
+
+[sublime bindings](http://codemirror.net/demo/sublime.html): Use the proper key bindings for `addCursorToNextLine` and `addCursorToPrevLine`.
+
+### New features
+
+[jsx mode](http://codemirror.net/mode/jsx/index.html): Support JSX fragments.
+
+[closetag addon](http://codemirror.net/demo/closetag.html): Add an option to disable auto-indenting.
+
+## 5.32.0 (2017-11-22)
+
+### Bug fixes
+
+Increase contrast on default bracket-matching colors.
+
+[javascript mode](http://codemirror.net/mode/javascript/): Recognize TypeScript type parameters for calls, type guards, and type parameter defaults. Improve handling of `enum` and `module` keywords.
+
+[comment addon](http://codemirror.net/doc/manual.html#addon_comment): Fix bug when uncommenting a comment that spans all but the last selected line.
+
+[searchcursor addon](http://codemirror.net/doc/manual.html#addon_searchcursor): Fix bug in case folding.
+
+[emacs bindings](http://codemirror.net/demo/emacs.html): Prevent single-character deletions from resetting the kill ring.
+
+[closebrackets addon](http://codemirror.net/doc/manual.html#addon_closebrackets): Tweak quote matching behavior.
+
+### New features
+
+[continuelist addon](http://codemirror.net/doc/manual.html#addon_continuelist): Increment ordered list numbers when adding one.
+
+## 5.31.0 (2017-10-20)
+
+### Bug fixes
+
+Further improve selection drawing and cursor motion in right-to-left documents.
+
+[vim bindings](http://codemirror.net/demo/vim.html): Fix ctrl-w behavior, support quote-dot and backtick-dot marks, make the wide cursor visible in contentEditable [input mode](http://codemirror.net/doc/manual.html#option_contentEditable).
+
+[continuecomment addon](http://codemirror.net/doc/manual.html#addon_continuecomment): Fix bug when pressing enter after a single-line block comment.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Fix issue with leaving indented fenced code blocks.
+
+[javascript mode](http://codemirror.net/mode/javascript/): Fix bad parsing of operators without spaces between them. Fix some corner cases around semicolon insertion and regexps.
+
+### New features
+
+Modes added with [`addOverlay`](http://codemirror.net/doc/manual.html#addOverlay) now have access to a [`baseToken`](http://codemirror.net/doc/manual.html#baseToken) method on their input stream, giving access to the tokens of the underlying mode.
+
+## 5.30.0 (2017-09-20)
+
+### Bug fixes
+
+Fixed a number of issues with drawing right-to-left selections and mouse selection in bidirectional text.
+
+[search addon](http://codemirror.net/demo/search/): Fix crash when restarting search after doing empty search.
+
+[mark-selection addon](http://cm/doc/manual.html#addon_mark-selection): Fix off-by-one bug.
+
+[tern addon](http://codemirror.net/demo/tern.html): Fix bad request made when editing at the bottom of a large document.
+
+[javascript mode](http://codemirror.net/mode/javascript/): Improve parsing in a number of corner cases.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Fix crash when a sub-mode doesn't support indentation, allow uppercase X in task lists.
+
+[gfm mode](http://codemirror.net/mode/gfm/): Don't highlight SHA1 'hashes' without numbers to avoid false positives.
+
+[soy mode](http://codemirror.net/mode/soy/): Support injected data and `@param` in comments.
+
+### New features
+
+[simple mode addon](http://codemirror.net/demo/simplemode.html): Allow groups in regexps when `token` isn't an array.
+
+## 5.29.0 (2017-08-24)
+
+### Bug fixes
+
+Fix crash in contentEditable input style when editing near a bookmark.
+
+Make sure change origins are preserved when splitting changes on [read-only marks](http://codemirror.net/doc/manual.html#mark_readOnly).
+
+[javascript mode](http://codemirror.net/mode/javascript/): More support for TypeScript syntax.
+
+[d mode](http://codemirror.net/mode/d/): Support nested comments.
+
+[python mode](http://codemirror.net/mode/python/): Improve tokenizing of operators.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Further improve CommonMark conformance.
+
+[css mode](http://codemirror.net/mode/css/): Don't run comment tokens through the mode's state machine.
+
+[shell mode](http://codemirror.net/mode/shell/): Allow strings to span lines.
+
+[search addon](http://codemirror.net/demo/search/): Fix crash in persistent search when `extraKeys` is null.
+
+## 5.28.0 (2017-07-21)
+
+### Bug fixes
+
+Fix copying of, or replacing editor content with, a single dash character when copying a big selection in some corner cases.
+
+Make [`"goLineLeft"`](http://codemirror.net/doc/manual.html#command_goLineLeft)/`"goLineRight"` behave better on wrapped lines.
+
+[sql mode](http://codemirror.net/mode/sql/): Fix tokenizing of multi-dot operator and allow digits in subfield names.
+
+[searchcursor addon](http://codemirror.net/doc/manual.html#addon_searchcursor): Fix infinite loop on some composed character inputs.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Make list parsing more CommonMark-compliant.
+
+[gfm mode](http://codemirror.net/mode/gfm/): Highlight colon syntax for emoji.
+
+### New features
+
+Expose [`startOperation`](http://codemirror.net/doc/manual.html#startOperation) and `endOperation` for explicit operation management.
+
+[sublime bindings](http://codemirror.net/demo/sublime.html): Add extend-selection (Ctrl-Alt- or Cmd-Shift-Up/Down).
+
+## 5.27.4 (2017-06-29)
+
+### Bug fixes
+
+Fix crash when using mode lookahead.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Don't block inner mode's indentation support.
+
+## 5.27.2 (2017-06-22)
+
+### Bug fixes
+
+Fix crash in the [simple mode](http://codemirror.net/demo/simplemode.html)< addon.
+
+## 5.27.0 (2017-06-22)
+
+### Bug fixes
+
+Fix infinite loop in forced display update.
+
+Properly disable the hidden textarea when `readOnly` is `"nocursor"`.
+
+Calling the `Doc` constructor without `new` works again.
+
+[sql mode](http://codemirror.net/mode/sql/): Handle nested comments.
+
+[javascript mode](http://codemirror.net/mode/javascript/): Improve support for TypeScript syntax.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Fix bug where markup was ignored on indented paragraph lines.
+
+[vim bindings](http://codemirror.net/demo/vim.html): Referencing invalid registers no longer causes an uncaught exception.
+
+[rust mode](http://codemirror.net/mode/rust/): Add the correct MIME type.
+
+[matchbrackets addon](http://codemirror.net/doc/manual.html#addon_matchbrackets): Document options.
+
+### New features
+
+Mouse button clicks can now be bound in keymaps by using names like `"LeftClick"` or `"Ctrl-Alt-MiddleTripleClick"`. When bound to a function, that function will be passed the position of the click as second argument.
+
+The behavior of mouse selection and dragging can now be customized with the [`configureMouse`](http://codemirror.net/doc/manual.html#option_configureMouse) option.
+
+Modes can now look ahead across line boundaries with the [`StringStream`](http://codemirror.net/doc/manual.html#StringStream)`.lookahead` method.
+
+Introduces a `"type"` token type, makes modes that recognize types output it, and add styling for it to the themes.
+
+New [`pasteLinesPerSelection`](http://codemirror.net/doc/manual.html#option_pasteLinesPerSelection) option to control the behavior of pasting multiple lines into multiple selections.
+
+[searchcursor addon](http://codemirror.net/doc/manual.html#addon_searchcursor): Support multi-line regular expression matches, and normalize strings when matching.
+
+## 5.26.0 (2017-05-22)
+
+### Bug fixes
+
+In textarea-mode, don't reset the input field during composition.
+
+More careful restoration of selections in widgets, during editor redraw.
+
+[javascript mode](http://codemirror.net/mode/javascript/): More TypeScript parsing fixes.
+
+[julia mode](http://codemirror.net/mode/julia/): Fix issue where the mode gets stuck.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Understand cross-line links, parse all bracketed things as links.
+
+[soy mode](http://codemirror.net/mode/soy/): Support single-quoted strings.
+
+[go mode](http://codemirror.net/mode/go/): Don't try to indent inside strings or comments.
+
+### New features
+
+[vim bindings](http://codemirror.net/demo/vim.html): Parse line offsets in line or range specs.
+
+## 5.25.2 (2017-04-20)
+
+### Bug fixes
+
+Better handling of selections that cover the whole viewport in contentEditable-mode.
+
+No longer accidentally scroll the editor into view when calling `setValue`.
+
+Work around Chrome Android bug when converting screen coordinates to editor positions.
+
+Make sure long-clicking a selection sets a cursor and doesn't show the editor losing focus.
+
+Fix issue where pointer events were incorrectly disabled on Chrome's overlay scrollbars.
+
+[javascript mode](http://codemirror.net/mode/javascript/): Recognize annotations and TypeScript-style type parameters.
+
+[shell mode](http://codemirror.net/mode/shell/): Handle nested braces.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Make parsing of strong/em delimiters CommonMark-compliant.
+
+## 5.25.0 (2017-03-20)
+
+### Bug fixes
+
+In contentEditable-mode, properly locate changes that repeat a character when inserted with IME.
+
+Fix handling of selections bigger than the viewport in contentEditable mode.
+
+Improve handling of changes that insert or delete lines in contentEditable mode.
+
+Count Unicode control characters 0x80 to 0x9F as special (non-printing) chars.
+
+Fix handling of shadow DOM roots when finding the active element.
+
+Add `role=presentation` to more DOM elements to improve screen reader support.
+
+[merge addon](http://codemirror.net/doc/manual.html#addon_merge): Make aligning of unchanged chunks more robust.
+
+[comment addon](http://codemirror.net/doc/manual.html#addon_comment): Fix comment-toggling on a block of text that starts and ends in a (differnet) block comment.
+
+[javascript mode](http://codemirror.net/mode/javascript/): Improve support for TypeScript syntax.
+
+[r mode](http://codemirror.net/mode/r/): Fix indentation after semicolon-less statements.
+
+[shell mode](http://codemirror.net/mode/shell/): Properly handle escaped parentheses in parenthesized expressions.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Fix a few bugs around leaving fenced code blocks.
+
+[soy mode](http://codemirror.net/mode/soy/): Improve indentation.
+
+### New features
+
+[lint addon](http://codemirror.net/doc/manual.html#addon_lint): Support asynchronous linters that return promises.
+
+[continuelist addon](http://codemirror.net/doc/manual.html#addon_continuelist): Support continuing task lists.
+
+[vim bindings](http://codemirror.net/demo/vim.html): Make Y behave like yy.
+
+[sql mode](http://codemirror.net/mode/sql/): Support sqlite dialect.
+
+## 5.24.2 (2017-02-22)
+
+### Bug fixes
+
+[javascript mode](http://codemirror.net/mode/javascript/): Support computed class method names.
+
+[merge addon](http://codemirror.net/doc/manual.html#addon_merge): Improve aligning of unchanged code in the presence of marks and line widgets.
+
+## 5.24.0 (2017-02-20)
+
+### Bug fixes
+
+A cursor directly before a line-wrapping break is now drawn before or after the line break depending on which direction you arrived from.
+
+Visual cursor motion in line-wrapped right-to-left text should be much more correct.
+
+Fix bug in handling of read-only marked text.
+
+[shell mode](http://codemirror.net/mode/shell/): Properly tokenize nested parentheses.
+
+[python mode](http://codemirror.net/mode/python/): Support underscores in number literals.
+
+[sass mode](http://codemirror.net/mode/sass/): Uses the full list of CSS properties and keywords from the CSS mode, rather than defining its own incomplete subset.
+
+[css mode](http://codemirror.net/mode/css/): Expose `lineComment` property for LESS and SCSS dialects. Recognize vendor prefixes on pseudo-elements.
+
+[julia mode](http://codemirror.net/mode/julia/): Properly indent `elseif` lines.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Properly recognize the end of fenced code blocks when inside other markup.
+
+[scala mode](http://codemirror.net/mode/clike/): Improve handling of operators containing #, @, and : chars.
+
+[xml mode](http://codemirror.net/mode/xml/): Allow dashes in HTML tag names.
+
+[javascript mode](http://codemirror.net/mode/javascript/): Improve parsing of async methods, TypeScript-style comma-separated superclass lists.
+
+[indent-fold addon](http://codemirror.net/demo/folding.html): Ignore comment lines.
+
+### New features
+
+Positions now support a `sticky` property which determines whether they should be associated with the character before (value `"before"`) or after (value `"after"`) them.
+
+[vim bindings](http://codemirror.net/demo/vim.html): Make it possible to remove built-in bindings through the API.
+
+[comment addon](http://codemirror.net/doc/manual.html#addon_comment): Support a per-mode useInnerComments option to optionally suppress descending to the inner modes to get comment strings.
+
+### Breaking changes
+
+The [sass mode](http://codemirror.net/mode/sass/) now depends on the [css mode](http://codemirror.net/mode/css/).
+
## 5.23.0 (2017-01-19)
### Bug fixes
diff --git a/js/codemirror-5.23.0/CONTRIBUTING.md b/js/codemirror-5.39.0/CONTRIBUTING.md
similarity index 95%
rename from js/codemirror-5.23.0/CONTRIBUTING.md
rename to js/codemirror-5.39.0/CONTRIBUTING.md
index c4cd019..1b0b104 100644
--- a/js/codemirror-5.23.0/CONTRIBUTING.md
+++ b/js/codemirror-5.39.0/CONTRIBUTING.md
@@ -47,6 +47,10 @@ should be asked on the
## Contributing code
+Note that we are not accepting any new addons or modes into the main
+distribution. If you've written such a module, please distribute it as
+a separate NPM package.
+
- Make sure you have a [GitHub Account](https://github.com/signup/free)
- Fork [CodeMirror](https://github.com/codemirror/CodeMirror/)
([how to fork a repo](https://help.github.com/articles/fork-a-repo))
diff --git a/js/codemirror-5.23.0/LICENSE b/js/codemirror-5.39.0/LICENSE
similarity index 98%
rename from js/codemirror-5.23.0/LICENSE
rename to js/codemirror-5.39.0/LICENSE
index 1bca6bf..ff7db4b 100644
--- a/js/codemirror-5.23.0/LICENSE
+++ b/js/codemirror-5.39.0/LICENSE
@@ -1,3 +1,5 @@
+MIT License
+
Copyright (C) 2017 by Marijn Haverbeke and others
Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/js/codemirror-5.23.0/README.md b/js/codemirror-5.39.0/README.md
similarity index 74%
rename from js/codemirror-5.23.0/README.md
rename to js/codemirror-5.39.0/README.md
index 3328e3b..9a982bc 100644
--- a/js/codemirror-5.23.0/README.md
+++ b/js/codemirror-5.39.0/README.md
@@ -1,4 +1,5 @@
# CodeMirror
+
[](https://travis-ci.org/codemirror/CodeMirror)
[](https://www.npmjs.org/package/codemirror)
[](https://gitter.im/codemirror/CodeMirror)
@@ -7,7 +8,8 @@
CodeMirror is a versatile text editor implemented in JavaScript for
the browser. It is specialized for editing code, and comes with over
100 language modes and various addons that implement more advanced
-editing functionality.
+editing functionality. Every language comes with fully-featured code
+and syntax highlighting to help with reading and editing complex code.
A rich programming API and a CSS theming system are available for
customizing CodeMirror to fit your application, and extending it with
@@ -27,6 +29,19 @@ The CodeMirror community aims to be welcoming to everybody. We use the
(1.1)](http://contributor-covenant.org/version/1/1/0/) as our code of
conduct.
+### Installation
+
+Either get the [zip file](https://codemirror.net/codemirror.zip) with
+the latest version, or make sure you have [Node](https://nodejs.org/)
+installed and run:
+
+ npm install codemirror
+
+**NOTE**: This is the source repository for the library, and not the
+distribution channel. Cloning it is not the recommended way to install
+the library, and will in fact not work unless you also run the build
+step.
+
### Quickstart
To build the project, make sure you have Node.js installed (at least version 6)
diff --git a/js/codemirror-5.23.0/addon/comment/comment.js b/js/codemirror-5.39.0/addon/comment/comment.js
similarity index 93%
rename from js/codemirror-5.23.0/addon/comment/comment.js
rename to js/codemirror-5.39.0/addon/comment/comment.js
index d71cf43..84c67ed 100644
--- a/js/codemirror-5.23.0/addon/comment/comment.js
+++ b/js/codemirror-5.39.0/addon/comment/comment.js
@@ -46,12 +46,17 @@
// Rough heuristic to try and detect lines that are part of multi-line string
function probablyInsideString(cm, pos, line) {
- return /\bstring\b/.test(cm.getTokenTypeAt(Pos(pos.line, 0))) && !/^[\'\"`]/.test(line)
+ return /\bstring\b/.test(cm.getTokenTypeAt(Pos(pos.line, 0))) && !/^[\'\"\`]/.test(line)
+ }
+
+ function getMode(cm, pos) {
+ var mode = cm.getMode()
+ return mode.useInnerComments === false || !mode.innerMode ? mode : cm.getModeAt(pos)
}
CodeMirror.defineExtension("lineComment", function(from, to, options) {
if (!options) options = noOptions;
- var self = this, mode = self.getModeAt(from);
+ var self = this, mode = getMode(self, from);
var firstLine = self.getLine(from.line);
if (firstLine == null || probablyInsideString(self, from, firstLine)) return;
@@ -95,7 +100,7 @@
CodeMirror.defineExtension("blockComment", function(from, to, options) {
if (!options) options = noOptions;
- var self = this, mode = self.getModeAt(from);
+ var self = this, mode = getMode(self, from);
var startString = options.blockCommentStart || mode.blockCommentStart;
var endString = options.blockCommentEnd || mode.blockCommentEnd;
if (!startString || !endString) {
@@ -129,7 +134,7 @@
CodeMirror.defineExtension("uncomment", function(from, to, options) {
if (!options) options = noOptions;
- var self = this, mode = self.getModeAt(from);
+ var self = this, mode = getMode(self, from);
var end = Math.min(to.ch != 0 || to.line == from.line ? to.line : to.line - 1, self.lastLine()), start = Math.min(from.line, end);
// Try finding line comments
@@ -167,13 +172,11 @@
if (open == -1) return false
var endLine = end == start ? startLine : self.getLine(end)
var close = endLine.indexOf(endString, end == start ? open + startString.length : 0);
- if (close == -1 && start != end) {
- endLine = self.getLine(--end);
- close = endLine.indexOf(endString);
- }
+ var insideStart = Pos(start, open + 1), insideEnd = Pos(end, close + 1)
if (close == -1 ||
- !/comment/.test(self.getTokenTypeAt(Pos(start, open + 1))) ||
- !/comment/.test(self.getTokenTypeAt(Pos(end, close + 1))))
+ !/comment/.test(self.getTokenTypeAt(insideStart)) ||
+ !/comment/.test(self.getTokenTypeAt(insideEnd)) ||
+ self.getRange(insideStart, insideEnd, "\n").indexOf(endString) > -1)
return false;
// Avoid killing block comments completely outside the selection.
diff --git a/js/codemirror-5.23.0/addon/comment/continuecomment.js b/js/codemirror-5.39.0/addon/comment/continuecomment.js
similarity index 65%
rename from js/codemirror-5.23.0/addon/comment/continuecomment.js
rename to js/codemirror-5.39.0/addon/comment/continuecomment.js
index b11d51e..d92318b 100644
--- a/js/codemirror-5.23.0/addon/comment/continuecomment.js
+++ b/js/codemirror-5.39.0/addon/comment/continuecomment.js
@@ -9,39 +9,32 @@
else // Plain browser env
mod(CodeMirror);
})(function(CodeMirror) {
- var modes = ["clike", "css", "javascript"];
-
- for (var i = 0; i < modes.length; ++i)
- CodeMirror.extendMode(modes[i], {blockCommentContinue: " * "});
-
function continueComment(cm) {
if (cm.getOption("disableInput")) return CodeMirror.Pass;
var ranges = cm.listSelections(), mode, inserts = [];
for (var i = 0; i < ranges.length; i++) {
- var pos = ranges[i].head, token = cm.getTokenAt(pos);
- if (token.type != "comment") return CodeMirror.Pass;
- var modeHere = CodeMirror.innerMode(cm.getMode(), token.state).mode;
+ var pos = ranges[i].head
+ if (!/\bcomment\b/.test(cm.getTokenTypeAt(pos))) return CodeMirror.Pass;
+ var modeHere = cm.getModeAt(pos)
if (!mode) mode = modeHere;
else if (mode != modeHere) return CodeMirror.Pass;
var insert = null;
if (mode.blockCommentStart && mode.blockCommentContinue) {
- var end = token.string.indexOf(mode.blockCommentEnd);
- var full = cm.getRange(CodeMirror.Pos(pos.line, 0), CodeMirror.Pos(pos.line, token.end)), found;
- if (end != -1 && end == token.string.length - mode.blockCommentEnd.length && pos.ch >= end) {
+ var line = cm.getLine(pos.line).slice(0, pos.ch)
+ var end = line.lastIndexOf(mode.blockCommentEnd), found
+ if (end != -1 && end == pos.ch - mode.blockCommentEnd.length) {
// Comment ended, don't continue it
- } else if (token.string.indexOf(mode.blockCommentStart) == 0) {
- insert = full.slice(0, token.start);
- if (!/^\s*$/.test(insert)) {
- insert = "";
- for (var j = 0; j < token.start; ++j) insert += " ";
+ } else if ((found = line.lastIndexOf(mode.blockCommentStart)) > -1 && found > end) {
+ insert = line.slice(0, found)
+ if (/\S/.test(insert)) {
+ insert = ""
+ for (var j = 0; j < found; ++j) insert += " "
}
- } else if ((found = full.indexOf(mode.blockCommentContinue)) != -1 &&
- found + mode.blockCommentContinue.length > token.start &&
- /^\s*$/.test(full.slice(0, found))) {
- insert = full.slice(0, found);
+ } else if ((found = line.indexOf(mode.blockCommentContinue)) > -1 && !/\S/.test(line.slice(0, found))) {
+ insert = line.slice(0, found)
}
- if (insert != null) insert += mode.blockCommentContinue;
+ if (insert != null) insert += mode.blockCommentContinue
}
if (insert == null && mode.lineComment && continueLineCommentEnabled(cm)) {
var line = cm.getLine(pos.line), found = line.indexOf(mode.lineComment);
diff --git a/js/codemirror-5.23.0/addon/dialog/dialog.css b/js/codemirror-5.39.0/addon/dialog/dialog.css
similarity index 100%
rename from js/codemirror-5.23.0/addon/dialog/dialog.css
rename to js/codemirror-5.39.0/addon/dialog/dialog.css
diff --git a/js/codemirror-5.23.0/addon/dialog/dialog.js b/js/codemirror-5.39.0/addon/dialog/dialog.js
similarity index 95%
rename from js/codemirror-5.23.0/addon/dialog/dialog.js
rename to js/codemirror-5.39.0/addon/dialog/dialog.js
index f10bb5b..f61e447 100644
--- a/js/codemirror-5.23.0/addon/dialog/dialog.js
+++ b/js/codemirror-5.39.0/addon/dialog/dialog.js
@@ -25,6 +25,7 @@
} else { // Assuming it's a detached DOM element.
dialog.appendChild(template);
}
+ CodeMirror.addClass(wrap, 'dialog-opened');
return dialog;
}
@@ -47,6 +48,7 @@
} else {
if (closed) return;
closed = true;
+ CodeMirror.rmClass(dialog.parentNode, 'dialog-opened');
dialog.parentNode.removeChild(dialog);
me.focus();
@@ -102,6 +104,7 @@
function close() {
if (closed) return;
closed = true;
+ CodeMirror.rmClass(dialog.parentNode, 'dialog-opened');
dialog.parentNode.removeChild(dialog);
me.focus();
}
@@ -141,6 +144,7 @@
if (closed) return;
closed = true;
clearTimeout(doneTimer);
+ CodeMirror.rmClass(dialog.parentNode, 'dialog-opened');
dialog.parentNode.removeChild(dialog);
}
diff --git a/js/codemirror-5.23.0/addon/display/autorefresh.js b/js/codemirror-5.39.0/addon/display/autorefresh.js
similarity index 100%
rename from js/codemirror-5.23.0/addon/display/autorefresh.js
rename to js/codemirror-5.39.0/addon/display/autorefresh.js
diff --git a/js/codemirror-5.23.0/addon/display/fullscreen.css b/js/codemirror-5.39.0/addon/display/fullscreen.css
similarity index 100%
rename from js/codemirror-5.23.0/addon/display/fullscreen.css
rename to js/codemirror-5.39.0/addon/display/fullscreen.css
diff --git a/js/codemirror-5.23.0/addon/display/fullscreen.js b/js/codemirror-5.39.0/addon/display/fullscreen.js
similarity index 100%
rename from js/codemirror-5.23.0/addon/display/fullscreen.js
rename to js/codemirror-5.39.0/addon/display/fullscreen.js
diff --git a/js/codemirror-5.23.0/addon/display/panel.js b/js/codemirror-5.39.0/addon/display/panel.js
similarity index 98%
rename from js/codemirror-5.23.0/addon/display/panel.js
rename to js/codemirror-5.39.0/addon/display/panel.js
index 74199ff..f88d152 100644
--- a/js/codemirror-5.23.0/addon/display/panel.js
+++ b/js/codemirror-5.39.0/addon/display/panel.js
@@ -66,7 +66,7 @@
Panel.prototype.changed = function(height) {
var newHeight = height == null ? this.node.offsetHeight : height;
var info = this.cm.state.panels;
- this.cm._setSize(null, info.height += (newHeight - this.height));
+ this.cm._setSize(null, info.heightLeft -= (newHeight - this.height));
this.height = newHeight;
};
diff --git a/js/codemirror-5.23.0/addon/display/placeholder.js b/js/codemirror-5.39.0/addon/display/placeholder.js
similarity index 97%
rename from js/codemirror-5.23.0/addon/display/placeholder.js
rename to js/codemirror-5.39.0/addon/display/placeholder.js
index 2f8b1f8..65753eb 100644
--- a/js/codemirror-5.23.0/addon/display/placeholder.js
+++ b/js/codemirror-5.39.0/addon/display/placeholder.js
@@ -38,6 +38,7 @@
clearPlaceholder(cm);
var elt = cm.state.placeholder = document.createElement("pre");
elt.style.cssText = "height: 0; overflow: visible";
+ elt.style.direction = cm.getOption("direction");
elt.className = "CodeMirror-placeholder";
var placeHolder = cm.getOption("placeholder")
if (typeof placeHolder == "string") placeHolder = document.createTextNode(placeHolder)
diff --git a/js/codemirror-5.23.0/addon/display/rulers.js b/js/codemirror-5.39.0/addon/display/rulers.js
similarity index 100%
rename from js/codemirror-5.23.0/addon/display/rulers.js
rename to js/codemirror-5.39.0/addon/display/rulers.js
diff --git a/js/codemirror-5.23.0/addon/edit/closebrackets.js b/js/codemirror-5.39.0/addon/edit/closebrackets.js
similarity index 84%
rename from js/codemirror-5.23.0/addon/edit/closebrackets.js
rename to js/codemirror-5.39.0/addon/edit/closebrackets.js
index 62b99c1..86b2fe1 100644
--- a/js/codemirror-5.23.0/addon/edit/closebrackets.js
+++ b/js/codemirror-5.39.0/addon/edit/closebrackets.js
@@ -23,6 +23,7 @@
cm.state.closeBrackets = null;
}
if (val) {
+ ensureBound(getOption(val, "pairs"))
cm.state.closeBrackets = val;
cm.addKeyMap(keyMap);
}
@@ -34,10 +35,14 @@
return defaults[name];
}
- var bind = defaults.pairs + "`";
var keyMap = {Backspace: handleBackspace, Enter: handleEnter};
- for (var i = 0; i < bind.length; i++)
- keyMap["'" + bind.charAt(i) + "'"] = handler(bind.charAt(i));
+ function ensureBound(chars) {
+ for (var i = 0; i < chars.length; i++) {
+ var ch = chars.charAt(i), key = "'" + ch + "'"
+ if (!keyMap[key]) keyMap[key] = handler(ch)
+ }
+ }
+ ensureBound(defaults.pairs + "`")
function handler(ch) {
return function(cm) { return handleChar(cm, ch); };
@@ -79,7 +84,8 @@
if (!around || explode.indexOf(around) % 2 != 0) return CodeMirror.Pass;
}
cm.operation(function() {
- cm.replaceSelection("\n\n", null);
+ var linesep = cm.lineSeparator() || "\n";
+ cm.replaceSelection(linesep + linesep, null);
cm.execCommand("goCharLeft");
ranges = cm.listSelections();
for (var i = 0; i < ranges.length; i++) {
@@ -123,11 +129,12 @@
else
curType = "skip";
} else if (identical && cur.ch > 1 && triples.indexOf(ch) >= 0 &&
- cm.getRange(Pos(cur.line, cur.ch - 2), cur) == ch + ch &&
- (cur.ch <= 2 || cm.getRange(Pos(cur.line, cur.ch - 3), Pos(cur.line, cur.ch - 2)) != ch)) {
+ cm.getRange(Pos(cur.line, cur.ch - 2), cur) == ch + ch) {
+ if (cur.ch > 2 && /\bstring/.test(cm.getTokenTypeAt(Pos(cur.line, cur.ch - 2)))) return CodeMirror.Pass;
curType = "addFour";
} else if (identical) {
- if (!CodeMirror.isWordChar(next) && enteringString(cm, cur, ch)) curType = "both";
+ var prev = cur.ch == 0 ? " " : cm.getRange(Pos(cur.line, cur.ch - 1), cur)
+ if (!CodeMirror.isWordChar(next) && prev != ch && !CodeMirror.isWordChar(prev)) curType = "both";
else return CodeMirror.Pass;
} else if (opening && (cm.getLine(cur.line).length == cur.ch ||
isClosingBracket(next, pairs) ||
@@ -179,24 +186,9 @@
return str.length == 2 ? str : null;
}
- // Project the token type that will exists after the given char is
- // typed, and use it to determine whether it would cause the start
- // of a string token.
- function enteringString(cm, pos, ch) {
- var line = cm.getLine(pos.line);
- var token = cm.getTokenAt(pos);
- if (/\bstring2?\b/.test(token.type)) return false;
- var stream = new CodeMirror.StringStream(line.slice(0, pos.ch) + ch + line.slice(pos.ch), 4);
- stream.pos = stream.start = token.start;
- for (;;) {
- var type1 = cm.getMode().token(stream, token.state);
- if (stream.pos >= pos.ch + 1) return /\bstring2?\b/.test(type1);
- stream.start = stream.pos;
- }
- }
-
function stringStartsAfter(cm, pos) {
var token = cm.getTokenAt(Pos(pos.line, pos.ch + 1))
- return /\bstring/.test(token.type) && token.start == pos.ch
+ return /\bstring/.test(token.type) && token.start == pos.ch &&
+ (pos.ch == 0 || !/\bstring/.test(cm.getTokenTypeAt(pos)))
}
});
diff --git a/js/codemirror-5.23.0/addon/edit/closetag.js b/js/codemirror-5.39.0/addon/edit/closetag.js
similarity index 92%
rename from js/codemirror-5.23.0/addon/edit/closetag.js
rename to js/codemirror-5.39.0/addon/edit/closetag.js
index a518da3..83f133a 100644
--- a/js/codemirror-5.23.0/addon/edit/closetag.js
+++ b/js/codemirror-5.39.0/addon/edit/closetag.js
@@ -53,13 +53,14 @@
function autoCloseGT(cm) {
if (cm.getOption("disableInput")) return CodeMirror.Pass;
var ranges = cm.listSelections(), replacements = [];
+ var opt = cm.getOption("autoCloseTags");
for (var i = 0; i < ranges.length; i++) {
if (!ranges[i].empty()) return CodeMirror.Pass;
var pos = ranges[i].head, tok = cm.getTokenAt(pos);
var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
if (inner.mode.name != "xml" || !state.tagName) return CodeMirror.Pass;
- var opt = cm.getOption("autoCloseTags"), html = inner.mode.configuration == "html";
+ var html = inner.mode.configuration == "html";
var dontCloseTags = (typeof opt == "object" && opt.dontCloseTags) || (html && htmlDontClose);
var indentTags = (typeof opt == "object" && opt.indentTags) || (html && htmlIndent);
@@ -81,13 +82,14 @@
newPos: indent ? CodeMirror.Pos(pos.line + 1, 0) : CodeMirror.Pos(pos.line, pos.ch + 1)};
}
+ var dontIndentOnAutoClose = (typeof opt == "object" && opt.dontIndentOnAutoClose);
for (var i = ranges.length - 1; i >= 0; i--) {
var info = replacements[i];
cm.replaceRange(info.text, ranges[i].head, ranges[i].anchor, "+insert");
var sel = cm.listSelections().slice(0);
sel[i] = {head: info.newPos, anchor: info.newPos};
cm.setSelections(sel);
- if (info.indent) {
+ if (!dontIndentOnAutoClose && info.indent) {
cm.indentLine(info.newPos.line, null, true);
cm.indentLine(info.newPos.line + 1, null, true);
}
@@ -97,6 +99,8 @@
function autoCloseCurrent(cm, typingSlash) {
var ranges = cm.listSelections(), replacements = [];
var head = typingSlash ? "/" : "";
+ var opt = cm.getOption("autoCloseTags");
+ var dontIndentOnAutoClose = (typeof opt == "object" && opt.dontIndentOnSlash);
for (var i = 0; i < ranges.length; i++) {
if (!ranges[i].empty()) return CodeMirror.Pass;
var pos = ranges[i].head, tok = cm.getTokenAt(pos);
@@ -127,9 +131,11 @@
}
cm.replaceSelections(replacements);
ranges = cm.listSelections();
- for (var i = 0; i < ranges.length; i++)
- if (i == ranges.length - 1 || ranges[i].head.line < ranges[i + 1].head.line)
- cm.indentLine(ranges[i].head.line);
+ if (!dontIndentOnAutoClose) {
+ for (var i = 0; i < ranges.length; i++)
+ if (i == ranges.length - 1 || ranges[i].head.line < ranges[i + 1].head.line)
+ cm.indentLine(ranges[i].head.line);
+ }
}
function autoCloseSlash(cm) {
diff --git a/js/codemirror-5.39.0/addon/edit/continuelist.js b/js/codemirror-5.39.0/addon/edit/continuelist.js
new file mode 100644
index 0000000..4e7d392
--- /dev/null
+++ b/js/codemirror-5.39.0/addon/edit/continuelist.js
@@ -0,0 +1,89 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(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";
+
+ var listRE = /^(\s*)(>[> ]*|[*+-] \[[x ]\]\s|[*+-]\s|(\d+)([.)]))(\s*)/,
+ emptyListRE = /^(\s*)(>[> ]*|[*+-] \[[x ]\]|[*+-]|(\d+)[.)])(\s*)$/,
+ unorderedListRE = /[*+-]\s/;
+
+ CodeMirror.commands.newlineAndIndentContinueMarkdownList = function(cm) {
+ if (cm.getOption("disableInput")) return CodeMirror.Pass;
+ var ranges = cm.listSelections(), replacements = [];
+ for (var i = 0; i < ranges.length; i++) {
+ var pos = ranges[i].head;
+ var eolState = cm.getStateAfter(pos.line);
+ var inList = eolState.list !== false;
+ var inQuote = eolState.quote !== 0;
+
+ var line = cm.getLine(pos.line), match = listRE.exec(line);
+ var cursorBeforeBullet = /^\s*$/.test(line.slice(0, pos.ch));
+ if (!ranges[i].empty() || (!inList && !inQuote) || !match || cursorBeforeBullet) {
+ cm.execCommand("newlineAndIndent");
+ return;
+ }
+ if (emptyListRE.test(line)) {
+ if (!/>\s*$/.test(line)) cm.replaceRange("", {
+ line: pos.line, ch: 0
+ }, {
+ line: pos.line, ch: pos.ch + 1
+ });
+ replacements[i] = "\n";
+ } else {
+ var indent = match[1], after = match[5];
+ var numbered = !(unorderedListRE.test(match[2]) || match[2].indexOf(">") >= 0);
+ var bullet = numbered ? (parseInt(match[3], 10) + 1) + match[4] : match[2].replace("x", " ");
+ replacements[i] = "\n" + indent + bullet + after;
+
+ if (numbered) incrementRemainingMarkdownListNumbers(cm, pos);
+ }
+ }
+
+ cm.replaceSelections(replacements);
+ };
+
+ // Auto-updating Markdown list numbers when a new item is added to the
+ // middle of a list
+ function incrementRemainingMarkdownListNumbers(cm, pos) {
+ var startLine = pos.line, lookAhead = 0, skipCount = 0;
+ var startItem = listRE.exec(cm.getLine(startLine)), startIndent = startItem[1];
+
+ do {
+ lookAhead += 1;
+ var nextLineNumber = startLine + lookAhead;
+ var nextLine = cm.getLine(nextLineNumber), nextItem = listRE.exec(nextLine);
+
+ if (nextItem) {
+ var nextIndent = nextItem[1];
+ var newNumber = (parseInt(startItem[3], 10) + lookAhead - skipCount);
+ var nextNumber = (parseInt(nextItem[3], 10)), itemNumber = nextNumber;
+
+ if (startIndent === nextIndent && !isNaN(nextNumber)) {
+ if (newNumber === nextNumber) itemNumber = nextNumber + 1;
+ if (newNumber > nextNumber) itemNumber = newNumber + 1;
+ cm.replaceRange(
+ nextLine.replace(listRE, nextIndent + itemNumber + nextItem[4] + nextItem[5]),
+ {
+ line: nextLineNumber, ch: 0
+ }, {
+ line: nextLineNumber, ch: nextLine.length
+ });
+ } else {
+ if (startIndent.length > nextIndent.length) return;
+ // This doesn't run if the next line immediatley indents, as it is
+ // not clear of the users intention (new indented item or same level)
+ if ((startIndent.length < nextIndent.length) && (lookAhead === 1)) return;
+ skipCount += 1;
+ }
+ }
+ } while (nextItem);
+ }
+});
diff --git a/js/codemirror-5.23.0/addon/edit/matchbrackets.js b/js/codemirror-5.39.0/addon/edit/matchbrackets.js
similarity index 75%
rename from js/codemirror-5.23.0/addon/edit/matchbrackets.js
rename to js/codemirror-5.39.0/addon/edit/matchbrackets.js
index 76754ed..c9851bd 100644
--- a/js/codemirror-5.23.0/addon/edit/matchbrackets.js
+++ b/js/codemirror-5.39.0/addon/edit/matchbrackets.js
@@ -16,12 +16,21 @@
var matching = {"(": ")>", ")": "(<", "[": "]>", "]": "[<", "{": "}>", "}": "{<"};
- function findMatchingBracket(cm, where, strict, config) {
+ function findMatchingBracket(cm, where, config) {
var line = cm.getLineHandle(where.line), pos = where.ch - 1;
- var match = (pos >= 0 && matching[line.text.charAt(pos)]) || matching[line.text.charAt(++pos)];
+ var afterCursor = config && config.afterCursor
+ if (afterCursor == null)
+ afterCursor = /(^| )cm-fat-cursor($| )/.test(cm.getWrapperElement().className)
+
+ // A cursor is defined as between two characters, but in in vim command mode
+ // (i.e. not insert mode), the cursor is visually represented as a
+ // highlighted box on top of the 2nd character. Otherwise, we allow matches
+ // from before or after the cursor.
+ var match = (!afterCursor && pos >= 0 && matching[line.text.charAt(pos)]) ||
+ matching[line.text.charAt(++pos)];
if (!match) return null;
var dir = match.charAt(1) == ">" ? 1 : -1;
- if (strict && (dir > 0) != (pos == where.ch)) return null;
+ if (config && config.strict && (dir > 0) != (pos == where.ch)) return null;
var style = cm.getTokenTypeAt(Pos(where.line, pos + 1));
var found = scanForBracket(cm, Pos(where.line, pos + (dir > 0 ? 1 : 0)), dir, style || null, config);
@@ -69,7 +78,7 @@
var maxHighlightLen = cm.state.matchBrackets.maxHighlightLineLength || 1000;
var marks = [], ranges = cm.listSelections();
for (var i = 0; i < ranges.length; i++) {
- var match = ranges[i].empty() && findMatchingBracket(cm, ranges[i].head, false, config);
+ var match = ranges[i].empty() && findMatchingBracket(cm, ranges[i].head, config);
if (match && cm.getLine(match.from.line).length <= maxHighlightLen) {
var style = match.match ? "CodeMirror-matchingbracket" : "CodeMirror-nonmatchingbracket";
marks.push(cm.markText(match.from, Pos(match.from.line, match.from.ch + 1), {className: style}));
@@ -93,18 +102,23 @@
}
}
- var currentlyHighlighted = null;
function doMatchBrackets(cm) {
cm.operation(function() {
- if (currentlyHighlighted) {currentlyHighlighted(); currentlyHighlighted = null;}
- currentlyHighlighted = matchBrackets(cm, false, cm.state.matchBrackets);
+ if (cm.state.matchBrackets.currentlyHighlighted) {
+ cm.state.matchBrackets.currentlyHighlighted();
+ cm.state.matchBrackets.currentlyHighlighted = null;
+ }
+ cm.state.matchBrackets.currentlyHighlighted = matchBrackets(cm, false, cm.state.matchBrackets);
});
}
CodeMirror.defineOption("matchBrackets", false, function(cm, val, old) {
if (old && old != CodeMirror.Init) {
cm.off("cursorActivity", doMatchBrackets);
- if (currentlyHighlighted) {currentlyHighlighted(); currentlyHighlighted = null;}
+ if (cm.state.matchBrackets && cm.state.matchBrackets.currentlyHighlighted) {
+ cm.state.matchBrackets.currentlyHighlighted();
+ cm.state.matchBrackets.currentlyHighlighted = null;
+ }
}
if (val) {
cm.state.matchBrackets = typeof val == "object" ? val : {};
@@ -113,8 +127,17 @@
});
CodeMirror.defineExtension("matchBrackets", function() {matchBrackets(this, true);});
- CodeMirror.defineExtension("findMatchingBracket", function(pos, strict, config){
- return findMatchingBracket(this, pos, strict, config);
+ CodeMirror.defineExtension("findMatchingBracket", function(pos, config, oldConfig){
+ // Backwards-compatibility kludge
+ if (oldConfig || typeof config == "boolean") {
+ if (!oldConfig) {
+ config = config ? {strict: true} : null
+ } else {
+ oldConfig.strict = config
+ config = oldConfig
+ }
+ }
+ return findMatchingBracket(this, pos, config)
});
CodeMirror.defineExtension("scanForBracket", function(pos, dir, style, config){
return scanForBracket(this, pos, dir, style, config);
diff --git a/js/codemirror-5.23.0/addon/edit/matchtags.js b/js/codemirror-5.39.0/addon/edit/matchtags.js
similarity index 100%
rename from js/codemirror-5.23.0/addon/edit/matchtags.js
rename to js/codemirror-5.39.0/addon/edit/matchtags.js
diff --git a/js/codemirror-5.23.0/addon/edit/trailingspace.js b/js/codemirror-5.39.0/addon/edit/trailingspace.js
similarity index 100%
rename from js/codemirror-5.23.0/addon/edit/trailingspace.js
rename to js/codemirror-5.39.0/addon/edit/trailingspace.js
diff --git a/js/codemirror-5.23.0/addon/fold/brace-fold.js b/js/codemirror-5.39.0/addon/fold/brace-fold.js
similarity index 100%
rename from js/codemirror-5.23.0/addon/fold/brace-fold.js
rename to js/codemirror-5.39.0/addon/fold/brace-fold.js
diff --git a/js/codemirror-5.23.0/addon/fold/comment-fold.js b/js/codemirror-5.39.0/addon/fold/comment-fold.js
similarity index 100%
rename from js/codemirror-5.23.0/addon/fold/comment-fold.js
rename to js/codemirror-5.39.0/addon/fold/comment-fold.js
diff --git a/js/codemirror-5.23.0/addon/fold/foldcode.js b/js/codemirror-5.39.0/addon/fold/foldcode.js
similarity index 98%
rename from js/codemirror-5.23.0/addon/fold/foldcode.js
rename to js/codemirror-5.39.0/addon/fold/foldcode.js
index 78b36c4..826766b 100644
--- a/js/codemirror-5.23.0/addon/fold/foldcode.js
+++ b/js/codemirror-5.39.0/addon/fold/foldcode.js
@@ -65,6 +65,8 @@
widget = document.createElement("span");
widget.appendChild(text);
widget.className = "CodeMirror-foldmarker";
+ } else if (widget) {
+ widget = widget.cloneNode(true)
}
return widget;
}
diff --git a/js/codemirror-5.23.0/addon/fold/foldgutter.css b/js/codemirror-5.39.0/addon/fold/foldgutter.css
similarity index 100%
rename from js/codemirror-5.23.0/addon/fold/foldgutter.css
rename to js/codemirror-5.39.0/addon/fold/foldgutter.css
diff --git a/js/codemirror-5.23.0/addon/fold/foldgutter.js b/js/codemirror-5.39.0/addon/fold/foldgutter.js
similarity index 100%
rename from js/codemirror-5.23.0/addon/fold/foldgutter.js
rename to js/codemirror-5.39.0/addon/fold/foldgutter.js
diff --git a/js/codemirror-5.23.0/addon/fold/indent-fold.js b/js/codemirror-5.39.0/addon/fold/indent-fold.js
similarity index 57%
rename from js/codemirror-5.23.0/addon/fold/indent-fold.js
rename to js/codemirror-5.39.0/addon/fold/indent-fold.js
index e29f15e..f93edec 100644
--- a/js/codemirror-5.23.0/addon/fold/indent-fold.js
+++ b/js/codemirror-5.39.0/addon/fold/indent-fold.js
@@ -11,32 +11,36 @@
})(function(CodeMirror) {
"use strict";
+function lineIndent(cm, lineNo) {
+ var text = cm.getLine(lineNo)
+ var spaceTo = text.search(/\S/)
+ if (spaceTo == -1 || /\bcomment\b/.test(cm.getTokenTypeAt(CodeMirror.Pos(lineNo, spaceTo + 1))))
+ return -1
+ return CodeMirror.countColumn(text, null, cm.getOption("tabSize"))
+}
+
CodeMirror.registerHelper("fold", "indent", function(cm, start) {
- var tabSize = cm.getOption("tabSize"), firstLine = cm.getLine(start.line);
- if (!/\S/.test(firstLine)) return;
- var getIndent = function(line) {
- return CodeMirror.countColumn(line, null, tabSize);
- };
- var myIndent = getIndent(firstLine);
- var lastLineInFold = null;
+ var myIndent = lineIndent(cm, start.line)
+ if (myIndent < 0) return
+ var lastLineInFold = null
+
// Go through lines until we find a line that definitely doesn't belong in
// the block we're folding, or to the end.
for (var i = start.line + 1, end = cm.lastLine(); i <= end; ++i) {
- var curLine = cm.getLine(i);
- var curIndent = getIndent(curLine);
- if (curIndent > myIndent) {
+ var indent = lineIndent(cm, i)
+ if (indent == -1) {
+ } else if (indent > myIndent) {
// Lines with a greater indent are considered part of the block.
lastLineInFold = i;
- } else if (!/\S/.test(curLine)) {
- // Empty lines might be breaks within the block we're trying to fold.
} else {
- // A non-empty line at an indent equal to or less than ours marks the
- // start of another block.
+ // If this line has non-space, non-comment content, and is
+ // indented less or equal to the start line, it is the start of
+ // another block.
break;
}
}
if (lastLineInFold) return {
- from: CodeMirror.Pos(start.line, firstLine.length),
+ from: CodeMirror.Pos(start.line, cm.getLine(start.line).length),
to: CodeMirror.Pos(lastLineInFold, cm.getLine(lastLineInFold).length)
};
});
diff --git a/js/codemirror-5.23.0/addon/fold/markdown-fold.js b/js/codemirror-5.39.0/addon/fold/markdown-fold.js
similarity index 100%
rename from js/codemirror-5.23.0/addon/fold/markdown-fold.js
rename to js/codemirror-5.39.0/addon/fold/markdown-fold.js
diff --git a/js/codemirror-5.23.0/addon/fold/xml-fold.js b/js/codemirror-5.39.0/addon/fold/xml-fold.js
similarity index 94%
rename from js/codemirror-5.23.0/addon/fold/xml-fold.js
rename to js/codemirror-5.39.0/addon/fold/xml-fold.js
index 75a9e30..867ecb5 100644
--- a/js/codemirror-5.23.0/addon/fold/xml-fold.js
+++ b/js/codemirror-5.39.0/addon/fold/xml-fold.js
@@ -137,12 +137,14 @@
CodeMirror.registerHelper("fold", "xml", function(cm, start) {
var iter = new Iter(cm, start.line, 0);
for (;;) {
- var openTag = toNextTag(iter), end;
- if (!openTag || iter.line != start.line || !(end = toTagEnd(iter))) return;
+ var openTag = toNextTag(iter)
+ if (!openTag || iter.line != start.line) return
+ var end = toTagEnd(iter)
+ if (!end) return
if (!openTag[1] && end != "selfClose") {
var startPos = Pos(iter.line, iter.ch);
var endPos = findMatchingClose(iter, openTag[2]);
- return endPos && {from: startPos, to: endPos.from};
+ return endPos && cmp(endPos.from, startPos) > 0 ? {from: startPos, to: endPos.from} : null
}
}
});
@@ -163,10 +165,10 @@
}
};
- CodeMirror.findEnclosingTag = function(cm, pos, range) {
+ CodeMirror.findEnclosingTag = function(cm, pos, range, tag) {
var iter = new Iter(cm, pos.line, pos.ch, range);
for (;;) {
- var open = findMatchingOpen(iter);
+ var open = findMatchingOpen(iter, tag);
if (!open) break;
var forward = new Iter(cm, pos.line, pos.ch, range);
var close = findMatchingClose(forward, open.tag);
diff --git a/js/codemirror-5.23.0/addon/hint/anyword-hint.js b/js/codemirror-5.39.0/addon/hint/anyword-hint.js
similarity index 100%
rename from js/codemirror-5.23.0/addon/hint/anyword-hint.js
rename to js/codemirror-5.39.0/addon/hint/anyword-hint.js
diff --git a/js/codemirror-5.23.0/addon/hint/css-hint.js b/js/codemirror-5.39.0/addon/hint/css-hint.js
similarity index 100%
rename from js/codemirror-5.23.0/addon/hint/css-hint.js
rename to js/codemirror-5.39.0/addon/hint/css-hint.js
diff --git a/js/codemirror-5.23.0/addon/hint/html-hint.js b/js/codemirror-5.39.0/addon/hint/html-hint.js
similarity index 100%
rename from js/codemirror-5.23.0/addon/hint/html-hint.js
rename to js/codemirror-5.39.0/addon/hint/html-hint.js
diff --git a/js/codemirror-5.23.0/addon/hint/javascript-hint.js b/js/codemirror-5.39.0/addon/hint/javascript-hint.js
similarity index 93%
rename from js/codemirror-5.23.0/addon/hint/javascript-hint.js
rename to js/codemirror-5.39.0/addon/hint/javascript-hint.js
index d7088c1..f6ab2a2 100644
--- a/js/codemirror-5.23.0/addon/hint/javascript-hint.js
+++ b/js/codemirror-5.39.0/addon/hint/javascript-hint.js
@@ -32,7 +32,9 @@
// Find the token at the cursor
var cur = editor.getCursor(), token = getToken(editor, cur);
if (/\b(?:string|comment)\b/.test(token.type)) return;
- token.state = CodeMirror.innerMode(editor.getMode(), token.state).state;
+ var innerMode = CodeMirror.innerMode(editor.getMode(), token.state);
+ if (innerMode.mode.helperType === "json") return;
+ token.state = innerMode.state;
// If it's not a 'word-style' token, ignore the token.
if (!/^[\w$_]*$/.test(token.string)) {
@@ -92,8 +94,8 @@
var arrayProps = ("length concat join splice push pop shift unshift slice reverse sort indexOf " +
"lastIndexOf every some filter forEach map reduce reduceRight ").split(" ");
var funcProps = "prototype apply call bind".split(" ");
- var javascriptKeywords = ("break case catch continue debugger default delete do else false finally for function " +
- "if in instanceof new null return switch throw true try typeof var void while with").split(" ");
+ var javascriptKeywords = ("break case catch class const continue debugger default delete do else export extends false finally for function " +
+ "if in import instanceof new null return super switch this throw true try typeof var void while with yield").split(" ");
var coffeescriptKeywords = ("and break catch class continue delete do else extends false finally for " +
"if in instanceof isnt new no not null of off on or return switch then throw true try typeof until void while with yes").split(" ");
diff --git a/js/codemirror-5.23.0/addon/hint/show-hint.css b/js/codemirror-5.39.0/addon/hint/show-hint.css
similarity index 100%
rename from js/codemirror-5.23.0/addon/hint/show-hint.css
rename to js/codemirror-5.39.0/addon/hint/show-hint.css
diff --git a/js/codemirror-5.23.0/addon/hint/show-hint.js b/js/codemirror-5.39.0/addon/hint/show-hint.js
similarity index 94%
rename from js/codemirror-5.23.0/addon/hint/show-hint.js
rename to js/codemirror-5.39.0/addon/hint/show-hint.js
index 604bd3b..26dc0f0 100644
--- a/js/codemirror-5.23.0/addon/hint/show-hint.js
+++ b/js/codemirror-5.39.0/addon/hint/show-hint.js
@@ -98,7 +98,7 @@
var pos = this.cm.getCursor(), line = this.cm.getLine(pos.line);
if (pos.line != this.startPos.line || line.length - pos.ch != this.startLen - this.startPos.ch ||
pos.ch < this.startPos.ch || this.cm.somethingSelected() ||
- (pos.ch && this.options.closeCharacters.test(line.charAt(pos.ch - 1)))) {
+ (!pos.ch || this.options.closeCharacters.test(line.charAt(pos.ch - 1)))) {
this.close();
} else {
var self = this;
@@ -121,7 +121,6 @@
var picked = (this.widget && this.widget.picked) || (first && this.options.completeSingle);
if (this.widget) this.widget.close();
- if (data && this.data && isNewCompletion(this.data, data)) return;
this.data = data;
if (data && data.list.length) {
@@ -135,11 +134,6 @@
}
};
- function isNewCompletion(old, nw) {
- var moved = CodeMirror.cmpPos(nw.from, old.from)
- return moved > 0 && old.to.ch - old.from.ch != nw.to.ch - nw.from.ch
- }
-
function parseOptions(cm, pos, options) {
var editor = cm.options.hintOptions;
var out = {};
@@ -206,7 +200,8 @@
var widget = this, cm = completion.cm;
var hints = this.hints = document.createElement("ul");
- hints.className = "CodeMirror-hints";
+ var theme = completion.cm.options.theme;
+ hints.className = "CodeMirror-hints " + theme;
this.selectedHint = data.selectedHint || 0;
var completions = data.list;
@@ -302,7 +297,7 @@
setTimeout(function(){cm.focus();}, 20);
});
- CodeMirror.signal(data, "select", completions[0], hints.firstChild);
+ CodeMirror.signal(data, "select", completions[this.selectedHint], hints.childNodes[this.selectedHint]);
return true;
}
@@ -339,7 +334,7 @@
i = avoidWrap ? 0 : this.data.list.length - 1;
if (this.selectedHint == i) return;
var node = this.hints.childNodes[this.selectedHint];
- node.className = node.className.replace(" " + ACTIVE_HINT_ELEMENT_CLASS, "");
+ if (node) node.className = node.className.replace(" " + ACTIVE_HINT_ELEMENT_CLASS, "");
node = this.hints.childNodes[this.selectedHint = i];
node.className += " " + ACTIVE_HINT_ELEMENT_CLASS;
if (node.offsetTop < this.hints.scrollTop)
@@ -403,12 +398,13 @@
});
CodeMirror.registerHelper("hint", "fromList", function(cm, options) {
- var cur = cm.getCursor(), token = cm.getTokenAt(cur);
- var to = CodeMirror.Pos(cur.line, token.end);
- if (token.string && /\w/.test(token.string[token.string.length - 1])) {
- var term = token.string, from = CodeMirror.Pos(cur.line, token.start);
+ var cur = cm.getCursor(), token = cm.getTokenAt(cur)
+ var term, from = CodeMirror.Pos(cur.line, token.start), to = cur
+ if (token.start < cur.ch && /\w/.test(token.string.charAt(cur.ch - token.start - 1))) {
+ term = token.string.substr(0, cur.ch - token.start)
} else {
- var term = "", from = to;
+ term = ""
+ from = cur
}
var found = [];
for (var i = 0; i < options.words.length; i++) {
diff --git a/js/codemirror-5.23.0/addon/hint/sql-hint.js b/js/codemirror-5.39.0/addon/hint/sql-hint.js
similarity index 73%
rename from js/codemirror-5.23.0/addon/hint/sql-hint.js
rename to js/codemirror-5.39.0/addon/hint/sql-hint.js
index 1ee4f0b..62b69c9 100644
--- a/js/codemirror-5.23.0/addon/hint/sql-hint.js
+++ b/js/codemirror-5.39.0/addon/hint/sql-hint.js
@@ -14,6 +14,7 @@
var tables;
var defaultTable;
var keywords;
+ var identifierQuote;
var CONS = {
QUERY_DIV: ";",
ALIAS_KEYWORD: "AS"
@@ -28,6 +29,12 @@
return CodeMirror.resolveMode(mode).keywords;
}
+ function getIdentifierQuote(editor) {
+ var mode = editor.doc.modeOption;
+ if (mode === "sql") mode = "text/x-sql";
+ return CodeMirror.resolveMode(mode).identifierQuote || "`";
+ }
+
function getText(item) {
return typeof item == "string" ? item : item.text;
}
@@ -86,17 +93,25 @@
}
function cleanName(name) {
- // Get rid name from backticks(`) and preceding dot(.)
+ // Get rid name from identifierQuote and preceding dot(.)
if (name.charAt(0) == ".") {
name = name.substr(1);
}
- return name.replace(/`/g, "");
+ // replace doublicated identifierQuotes with single identifierQuotes
+ // and remove single identifierQuotes
+ var nameParts = name.split(identifierQuote+identifierQuote);
+ for (var i = 0; i < nameParts.length; i++)
+ nameParts[i] = nameParts[i].replace(new RegExp(identifierQuote,"g"), "");
+ return nameParts.join(identifierQuote);
}
- function insertBackticks(name) {
+ function insertIdentifierQuotes(name) {
var nameParts = getText(name).split(".");
for (var i = 0; i < nameParts.length; i++)
- nameParts[i] = "`" + nameParts[i] + "`";
+ nameParts[i] = identifierQuote +
+ // doublicate identifierQuotes
+ nameParts[i].replace(new RegExp(identifierQuote,"g"), identifierQuote+identifierQuote) +
+ identifierQuote;
var escaped = nameParts.join(".");
if (typeof name == "string") return escaped;
name = shallowClone(name);
@@ -106,13 +121,13 @@
function nameCompletion(cur, token, result, editor) {
// Try to complete table, column names and return start position of completion
- var useBacktick = false;
+ var useIdentifierQuotes = false;
var nameParts = [];
var start = token.start;
var cont = true;
while (cont) {
cont = (token.string.charAt(0) == ".");
- useBacktick = useBacktick || (token.string.charAt(0) == "`");
+ useIdentifierQuotes = useIdentifierQuotes || (token.string.charAt(0) == identifierQuote);
start = token.start;
nameParts.unshift(cleanName(token.string));
@@ -127,12 +142,12 @@
// Try to complete table names
var string = nameParts.join(".");
addMatches(result, string, tables, function(w) {
- return useBacktick ? insertBackticks(w) : w;
+ return useIdentifierQuotes ? insertIdentifierQuotes(w) : w;
});
// Try to complete columns from defaultTable
addMatches(result, string, defaultTable, function(w) {
- return useBacktick ? insertBackticks(w) : w;
+ return useIdentifierQuotes ? insertIdentifierQuotes(w) : w;
});
// Try to complete columns
@@ -162,7 +177,7 @@
w = shallowClone(w);
w.text = tableInsert + "." + w.text;
}
- return useBacktick ? insertBackticks(w) : w;
+ return useIdentifierQuotes ? insertIdentifierQuotes(w) : w;
});
}
@@ -170,12 +185,9 @@
}
function eachWord(lineText, f) {
- if (!lineText) return;
- var excepted = /[,;]/g;
- var words = lineText.split(" ");
- for (var i = 0; i < words.length; i++) {
- f(words[i]?words[i].replace(excepted, '') : '');
- }
+ var words = lineText.split(/\s+/)
+ for (var i = 0; i < words.length; i++)
+ if (words[i]) f(words[i].replace(/[,;]/g, ''))
}
function findTableByAlias(alias, editor) {
@@ -210,18 +222,20 @@
prevItem = separator[i];
}
- var query = doc.getRange(validRange.start, validRange.end, false);
-
- for (var i = 0; i < query.length; i++) {
- var lineText = query[i];
- eachWord(lineText, function(word) {
- var wordUpperCase = word.toUpperCase();
- if (wordUpperCase === aliasUpperCase && getTable(previousWord))
- table = previousWord;
- if (wordUpperCase !== CONS.ALIAS_KEYWORD)
- previousWord = word;
- });
- if (table) break;
+ if (validRange.start) {
+ var query = doc.getRange(validRange.start, validRange.end, false);
+
+ for (var i = 0; i < query.length; i++) {
+ var lineText = query[i];
+ eachWord(lineText, function(word) {
+ var wordUpperCase = word.toUpperCase();
+ if (wordUpperCase === aliasUpperCase && getTable(previousWord))
+ table = previousWord;
+ if (wordUpperCase !== CONS.ALIAS_KEYWORD)
+ previousWord = word;
+ });
+ if (table) break;
+ }
}
return table;
}
@@ -232,6 +246,7 @@
var disableKeywords = options && options.disableKeywords;
defaultTable = defaultTableName && getTable(defaultTableName);
keywords = getKeywords(editor);
+ identifierQuote = getIdentifierQuote(editor);
if (defaultTableName && !defaultTable)
defaultTable = findTableByAlias(defaultTableName, editor);
@@ -249,7 +264,7 @@
token.string = token.string.slice(0, cur.ch - token.start);
}
- if (token.string.match(/^[.`\w@]\w*$/)) {
+ if (token.string.match(/^[.`"\w@]\w*$/)) {
search = token.string;
start = token.start;
end = token.end;
@@ -257,13 +272,26 @@
start = end = cur.ch;
search = "";
}
- if (search.charAt(0) == "." || search.charAt(0) == "`") {
+ if (search.charAt(0) == "." || search.charAt(0) == identifierQuote) {
start = nameCompletion(cur, token, result, editor);
} else {
- addMatches(result, search, tables, function(w) {return w;});
- addMatches(result, search, defaultTable, function(w) {return w;});
+ addMatches(result, search, defaultTable, function(w) {return {text:w, className: "CodeMirror-hint-table CodeMirror-hint-default-table"};});
+ addMatches(
+ result,
+ search,
+ tables,
+ function(w) {
+ if (typeof w === 'object') {
+ w.className = "CodeMirror-hint-table";
+ } else {
+ w = {text: w, className: "CodeMirror-hint-table"};
+ }
+
+ return w;
+ }
+ );
if (!disableKeywords)
- addMatches(result, search, keywords, function(w) {return w.toUpperCase();});
+ addMatches(result, search, keywords, function(w) {return {text: w.toUpperCase(), className: "CodeMirror-hint-keyword"};});
}
return {list: result, from: Pos(cur.line, start), to: Pos(cur.line, end)};
diff --git a/js/codemirror-5.23.0/addon/hint/xml-hint.js b/js/codemirror-5.39.0/addon/hint/xml-hint.js
similarity index 100%
rename from js/codemirror-5.23.0/addon/hint/xml-hint.js
rename to js/codemirror-5.39.0/addon/hint/xml-hint.js
diff --git a/js/codemirror-5.23.0/addon/lint/coffeescript-lint.js b/js/codemirror-5.39.0/addon/lint/coffeescript-lint.js
similarity index 86%
rename from js/codemirror-5.23.0/addon/lint/coffeescript-lint.js
rename to js/codemirror-5.39.0/addon/lint/coffeescript-lint.js
index 7e39428..70621a1 100644
--- a/js/codemirror-5.23.0/addon/lint/coffeescript-lint.js
+++ b/js/codemirror-5.39.0/addon/lint/coffeescript-lint.js
@@ -17,6 +17,12 @@
CodeMirror.registerHelper("lint", "coffeescript", function(text) {
var found = [];
+ if (!window.coffeelint) {
+ if (window.console) {
+ window.console.error("Error: window.coffeelint not defined, CodeMirror CoffeeScript linting cannot run.");
+ }
+ return found;
+ }
var parseError = function(err) {
var loc = err.lineNumber;
found.push({from: CodeMirror.Pos(loc-1, 0),
diff --git a/js/codemirror-5.23.0/addon/lint/css-lint.js b/js/codemirror-5.39.0/addon/lint/css-lint.js
similarity index 73%
rename from js/codemirror-5.23.0/addon/lint/css-lint.js
rename to js/codemirror-5.39.0/addon/lint/css-lint.js
index 1f61b47..135d031 100644
--- a/js/codemirror-5.23.0/addon/lint/css-lint.js
+++ b/js/codemirror-5.39.0/addon/lint/css-lint.js
@@ -15,10 +15,15 @@
})(function(CodeMirror) {
"use strict";
-CodeMirror.registerHelper("lint", "css", function(text) {
+CodeMirror.registerHelper("lint", "css", function(text, options) {
var found = [];
- if (!window.CSSLint) return found;
- var results = CSSLint.verify(text), messages = results.messages, message = null;
+ if (!window.CSSLint) {
+ if (window.console) {
+ window.console.error("Error: window.CSSLint not defined, CodeMirror CSS linting cannot run.");
+ }
+ return found;
+ }
+ var results = CSSLint.verify(text, options), messages = results.messages, message = null;
for ( var i = 0; i < messages.length; i++) {
message = messages[i];
var startLine = message.line -1, endLine = message.line -1, startCol = message.col -1, endCol = message.col;
diff --git a/js/codemirror-5.23.0/addon/lint/html-lint.js b/js/codemirror-5.39.0/addon/lint/html-lint.js
similarity index 76%
rename from js/codemirror-5.23.0/addon/lint/html-lint.js
rename to js/codemirror-5.39.0/addon/lint/html-lint.js
index 1e84170..23de9bb 100644
--- a/js/codemirror-5.23.0/addon/lint/html-lint.js
+++ b/js/codemirror-5.39.0/addon/lint/html-lint.js
@@ -11,8 +11,8 @@
else if (typeof define == "function" && define.amd) // AMD
define(["../../lib/codemirror", "htmlhint"], mod);
else // Plain browser env
- mod(CodeMirror);
-})(function(CodeMirror) {
+ mod(CodeMirror, window.HTMLHint);
+})(function(CodeMirror, HTMLHint) {
"use strict";
var defaultRules = {
@@ -29,7 +29,14 @@
CodeMirror.registerHelper("lint", "html", function(text, options) {
var found = [];
- if (!window.HTMLHint) return found;
+ if (HTMLHint && !HTMLHint.verify) HTMLHint = HTMLHint.HTMLHint;
+ if (!HTMLHint) HTMLHint = window.HTMLHint;
+ if (!HTMLHint) {
+ if (window.console) {
+ window.console.error("Error: HTMLHint not found, not defined on window, or not available through define/require, CodeMirror HTML linting cannot run.");
+ }
+ return found;
+ }
var messages = HTMLHint.verify(text, options && options.rules || defaultRules);
for (var i = 0; i < messages.length; i++) {
var message = messages[i];
diff --git a/js/codemirror-5.39.0/addon/lint/javascript-lint.js b/js/codemirror-5.39.0/addon/lint/javascript-lint.js
new file mode 100644
index 0000000..8266b7e
--- /dev/null
+++ b/js/codemirror-5.39.0/addon/lint/javascript-lint.js
@@ -0,0 +1,63 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(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";
+ // declare global: JSHINT
+
+ function validator(text, options) {
+ if (!window.JSHINT) {
+ if (window.console) {
+ window.console.error("Error: window.JSHINT not defined, CodeMirror JavaScript linting cannot run.");
+ }
+ return [];
+ }
+ if (!options.indent) // JSHint error.character actually is a column index, this fixes underlining on lines using tabs for indentation
+ options.indent = 1; // JSHint default value is 4
+ JSHINT(text, options, options.globals);
+ var errors = JSHINT.data().errors, result = [];
+ if (errors) parseErrors(errors, result);
+ return result;
+ }
+
+ CodeMirror.registerHelper("lint", "javascript", validator);
+
+ function parseErrors(errors, output) {
+ for ( var i = 0; i < errors.length; i++) {
+ var error = errors[i];
+ if (error) {
+ if (error.line <= 0) {
+ if (window.console) {
+ window.console.warn("Cannot display JSHint error (invalid line " + error.line + ")", error);
+ }
+ continue;
+ }
+
+ var start = error.character - 1, end = start + 1;
+ if (error.evidence) {
+ var index = error.evidence.substring(start).search(/.\b/);
+ if (index > -1) {
+ end += index;
+ }
+ }
+
+ // Convert to format expected by validation service
+ var hint = {
+ message: error.reason,
+ severity: error.code ? (error.code.startsWith('W') ? "warning" : "error") : "error",
+ from: CodeMirror.Pos(error.line - 1, start),
+ to: CodeMirror.Pos(error.line - 1, end)
+ };
+
+ output.push(hint);
+ }
+ }
+ }
+});
diff --git a/js/codemirror-5.23.0/addon/lint/json-lint.js b/js/codemirror-5.39.0/addon/lint/json-lint.js
similarity index 71%
rename from js/codemirror-5.23.0/addon/lint/json-lint.js
rename to js/codemirror-5.39.0/addon/lint/json-lint.js
index 9dbb616..63e70c4 100644
--- a/js/codemirror-5.23.0/addon/lint/json-lint.js
+++ b/js/codemirror-5.39.0/addon/lint/json-lint.js
@@ -17,6 +17,15 @@
CodeMirror.registerHelper("lint", "json", function(text) {
var found = [];
+ if (!window.jsonlint) {
+ if (window.console) {
+ window.console.error("Error: window.jsonlint not defined, CodeMirror JSON linting cannot run.");
+ }
+ return found;
+ }
+ // for jsonlint's web dist jsonlint is exported as an object with a single property parser, of which parseError
+ // is a subproperty
+ var jsonlint = window.jsonlint.parser || window.jsonlint
jsonlint.parseError = function(str, hash) {
var loc = hash.loc;
found.push({from: CodeMirror.Pos(loc.first_line - 1, loc.first_column),
diff --git a/js/codemirror-5.23.0/addon/lint/lint.css b/js/codemirror-5.39.0/addon/lint/lint.css
similarity index 100%
rename from js/codemirror-5.23.0/addon/lint/lint.css
rename to js/codemirror-5.39.0/addon/lint/lint.css
diff --git a/js/codemirror-5.23.0/addon/lint/lint.js b/js/codemirror-5.39.0/addon/lint/lint.js
similarity index 90%
rename from js/codemirror-5.23.0/addon/lint/lint.js
rename to js/codemirror-5.39.0/addon/lint/lint.js
index c1f1702..e00e77a 100644
--- a/js/codemirror-5.23.0/addon/lint/lint.js
+++ b/js/codemirror-5.39.0/addon/lint/lint.js
@@ -112,7 +112,11 @@
if (!severity) severity = "error";
var tip = document.createElement("div");
tip.className = "CodeMirror-lint-message-" + severity;
- tip.appendChild(document.createTextNode(ann.message));
+ if (typeof ann.messageHTML != 'undefined') {
+ tip.innerHTML = ann.messageHTML;
+ } else {
+ tip.appendChild(document.createTextNode(ann.message));
+ }
return tip;
}
@@ -128,19 +132,28 @@
cm.off("change", abort)
if (state.waitingFor != id) return
if (arg2 && annotations instanceof CodeMirror) annotations = arg2
- updateLinting(cm, annotations)
+ cm.operation(function() {updateLinting(cm, annotations)})
}, passOptions, cm);
}
function startLinting(cm) {
var state = cm.state.lint, options = state.options;
- var passOptions = options.options || options; // Support deprecated passing of `options` property in options
+ /*
+ * Passing rules in `options` property prevents JSHint (and other linters) from complaining
+ * about unrecognized rules like `onUpdateLinting`, `delay`, `lintOnChange`, etc.
+ */
+ var passOptions = options.options || options;
var getAnnotations = options.getAnnotations || cm.getHelper(CodeMirror.Pos(0, 0), "lint");
if (!getAnnotations) return;
if (options.async || getAnnotations.async) {
lintAsync(cm, getAnnotations, passOptions)
} else {
- updateLinting(cm, getAnnotations(cm.getValue(), passOptions, cm));
+ var annotations = getAnnotations(cm.getValue(), passOptions, cm);
+ if (!annotations) return;
+ if (annotations.then) annotations.then(function(issues) {
+ cm.operation(function() {updateLinting(cm, issues)})
+ });
+ else cm.operation(function() {updateLinting(cm, annotations)})
}
}
diff --git a/js/codemirror-5.23.0/addon/lint/yaml-lint.js b/js/codemirror-5.39.0/addon/lint/yaml-lint.js
similarity index 55%
rename from js/codemirror-5.23.0/addon/lint/yaml-lint.js
rename to js/codemirror-5.39.0/addon/lint/yaml-lint.js
index 3f77e52..3954ed3 100644
--- a/js/codemirror-5.23.0/addon/lint/yaml-lint.js
+++ b/js/codemirror-5.39.0/addon/lint/yaml-lint.js
@@ -17,10 +17,23 @@
CodeMirror.registerHelper("lint", "yaml", function(text) {
var found = [];
+ if (!window.jsyaml) {
+ if (window.console) {
+ window.console.error("Error: window.jsyaml not defined, CodeMirror YAML linting cannot run.");
+ }
+ return found;
+ }
try { jsyaml.load(text); }
catch(e) {
- var loc = e.mark;
- found.push({ from: CodeMirror.Pos(loc.line, loc.column), to: CodeMirror.Pos(loc.line, loc.column), message: e.message });
+ var loc = e.mark,
+ // js-yaml YAMLException doesn't always provide an accurate lineno
+ // e.g., when there are multiple yaml docs
+ // ---
+ // ---
+ // foo:bar
+ from = loc ? CodeMirror.Pos(loc.line, loc.column) : CodeMirror.Pos(0, 0),
+ to = from;
+ found.push({ from: from, to: to, message: e.message });
}
return found;
});
diff --git a/js/codemirror-5.23.0/addon/merge/merge.css b/js/codemirror-5.39.0/addon/merge/merge.css
similarity index 94%
rename from js/codemirror-5.23.0/addon/merge/merge.css
rename to js/codemirror-5.39.0/addon/merge/merge.css
index bda3d9f..dadd7f5 100644
--- a/js/codemirror-5.23.0/addon/merge/merge.css
+++ b/js/codemirror-5.39.0/addon/merge/merge.css
@@ -48,6 +48,12 @@
color: #555;
line-height: 1;
}
+.CodeMirror-merge-scrolllock:after {
+ content: "\21db\00a0\00a0\21da";
+}
+.CodeMirror-merge-scrolllock.CodeMirror-merge-scrolllock-enabled:after {
+ content: "\21db\21da";
+}
.CodeMirror-merge-copybuttons-left, .CodeMirror-merge-copybuttons-right {
position: absolute;
diff --git a/js/codemirror-5.23.0/addon/merge/merge.js b/js/codemirror-5.39.0/addon/merge/merge.js
similarity index 73%
rename from js/codemirror-5.23.0/addon/merge/merge.js
rename to js/codemirror-5.39.0/addon/merge/merge.js
index a8132b6..5b87b5e 100644
--- a/js/codemirror-5.23.0/addon/merge/merge.js
+++ b/js/codemirror-5.39.0/addon/merge/merge.js
@@ -37,23 +37,29 @@
constructor: DiffView,
init: function(pane, orig, options) {
this.edit = this.mv.edit;
- (this.edit.state.diffViews || (this.edit.state.diffViews = [])).push(this);
+ ;(this.edit.state.diffViews || (this.edit.state.diffViews = [])).push(this);
this.orig = CodeMirror(pane, copyObj({value: orig, readOnly: !this.mv.options.allowEditingOriginals}, copyObj(options)));
+ if (this.mv.options.connect == "align") {
+ if (!this.edit.state.trackAlignable) this.edit.state.trackAlignable = new TrackAlignable(this.edit)
+ this.orig.state.trackAlignable = new TrackAlignable(this.orig)
+ }
+
this.orig.state.diffViews = [this];
var classLocation = options.chunkClassLocation || "background";
if (Object.prototype.toString.call(classLocation) != "[object Array]") classLocation = [classLocation]
this.classes.classLocation = classLocation
- this.diff = getDiff(asString(orig), asString(options.value));
+ this.diff = getDiff(asString(orig), asString(options.value), this.mv.options.ignoreWhitespace);
this.chunks = getChunks(this.diff);
this.diffOutOfDate = this.dealigned = false;
+ this.needsScrollSync = null
this.showDifferences = options.showDifferences !== false;
},
- registerEvents: function() {
+ registerEvents: function(otherDv) {
this.forceUpdate = registerUpdate(this);
setScrollLock(this, true, false);
- registerScroll(this);
+ registerScroll(this, otherDv);
},
setShowDifferences: function(val) {
val = val !== false;
@@ -66,7 +72,7 @@
function ensureDiff(dv) {
if (dv.diffOutOfDate) {
- dv.diff = getDiff(dv.orig.getValue(), dv.edit.getValue());
+ dv.diff = getDiff(dv.orig.getValue(), dv.edit.getValue(), dv.mv.options.ignoreWhitespace);
dv.chunks = getChunks(dv.diff);
dv.diffOutOfDate = false;
CodeMirror.signal(dv.edit, "updateDiff", dv.diff);
@@ -97,6 +103,7 @@
if (dv.mv.options.connect == "align")
alignChunks(dv);
makeConnections(dv);
+ if (dv.needsScrollSync != null) syncScroll(dv, dv.needsScrollSync)
updating = false;
}
@@ -121,41 +128,47 @@
}
function swapDoc() {
dv.diffOutOfDate = true;
+ dv.dealigned = true;
update("full");
}
dv.edit.on("change", change);
dv.orig.on("change", change);
dv.edit.on("swapDoc", swapDoc);
dv.orig.on("swapDoc", swapDoc);
- dv.edit.on("markerAdded", setDealign);
- dv.edit.on("markerCleared", setDealign);
- dv.orig.on("markerAdded", setDealign);
- dv.orig.on("markerCleared", setDealign);
+ if (dv.mv.options.connect == "align") {
+ CodeMirror.on(dv.edit.state.trackAlignable, "realign", setDealign)
+ CodeMirror.on(dv.orig.state.trackAlignable, "realign", setDealign)
+ }
dv.edit.on("viewportChange", function() { set(false); });
dv.orig.on("viewportChange", function() { set(false); });
update();
return update;
}
- function registerScroll(dv) {
+ function registerScroll(dv, otherDv) {
dv.edit.on("scroll", function() {
- syncScroll(dv, DIFF_INSERT) && makeConnections(dv);
+ syncScroll(dv, true) && makeConnections(dv);
});
dv.orig.on("scroll", function() {
- syncScroll(dv, DIFF_DELETE) && makeConnections(dv);
+ syncScroll(dv, false) && makeConnections(dv);
+ if (otherDv) syncScroll(otherDv, true) && makeConnections(otherDv);
});
}
- function syncScroll(dv, type) {
+ function syncScroll(dv, toOrig) {
// Change handler will do a refresh after a timeout when diff is out of date
- if (dv.diffOutOfDate) return false;
+ if (dv.diffOutOfDate) {
+ if (dv.lockScroll && dv.needsScrollSync == null) dv.needsScrollSync = toOrig
+ return false
+ }
+ dv.needsScrollSync = null
if (!dv.lockScroll) return true;
var editor, other, now = +new Date;
- if (type == DIFF_INSERT) { editor = dv.edit; other = dv.orig; }
+ if (toOrig) { editor = dv.edit; other = dv.orig; }
else { editor = dv.orig; other = dv.edit; }
// Don't take action if the position of this editor was recently set
// (to prevent feedback loops)
- if (editor.state.scrollSetBy == dv && (editor.state.scrollSetAt || 0) + 50 > now) return false;
+ if (editor.state.scrollSetBy == dv && (editor.state.scrollSetAt || 0) + 250 > now) return false;
var sInfo = editor.getScrollInfo();
if (dv.mv.options.connect == "align") {
@@ -163,9 +176,9 @@
} else {
var halfScreen = .5 * sInfo.clientHeight, midY = sInfo.top + halfScreen;
var mid = editor.lineAtHeight(midY, "local");
- var around = chunkBoundariesAround(dv.chunks, mid, type == DIFF_INSERT);
- var off = getOffsets(editor, type == DIFF_INSERT ? around.edit : around.orig);
- var offOther = getOffsets(other, type == DIFF_INSERT ? around.orig : around.edit);
+ var around = chunkBoundariesAround(dv.chunks, mid, toOrig);
+ var off = getOffsets(editor, toOrig ? around.edit : around.orig);
+ var offOther = getOffsets(other, toOrig ? around.orig : around.edit);
var ratio = (midY - off.top) / (off.bot - off.top);
var targetPos = (offOther.top - halfScreen) + ratio * (offOther.bot - offOther.top);
@@ -198,7 +211,7 @@
function setScrollLock(dv, val, action) {
dv.lockScroll = val;
if (val && action != false) syncScroll(dv, DIFF_INSERT) && makeConnections(dv);
- dv.lockButton.innerHTML = val ? "\u21db\u21da" : "\u21db \u21da";
+ (val ? CodeMirror.addClass : CodeMirror.rmClass)(dv.lockButton, "CodeMirror-merge-scrolllock-enabled");
}
// Updating the marks for editor content
@@ -271,7 +284,7 @@
}
}
- var chunkStart = 0;
+ var chunkStart = 0, pending = false;
for (var i = 0; i < diff.length; ++i) {
var part = diff[i], tp = part[0], str = part[1];
if (tp == DIFF_EQUAL) {
@@ -279,10 +292,11 @@
moveOver(pos, str);
var cleanTo = pos.line + (endOfLineClean(diff, i) ? 1 : 0);
if (cleanTo > cleanFrom) {
- if (i) markChunk(chunkStart, cleanFrom);
+ if (pending) { markChunk(chunkStart, cleanFrom); pending = false }
chunkStart = cleanTo;
}
} else {
+ pending = true
if (tp == type) {
var end = moveOver(pos, str, true);
var a = posMax(top, pos), b = posMin(bot, end);
@@ -292,7 +306,7 @@
}
}
}
- if (chunkStart <= pos.line) markChunk(chunkStart, pos.line + 1);
+ if (pending) markChunk(chunkStart, pos.line + 1);
}
// Updating the gap between editor and original
@@ -331,24 +345,81 @@
return origStart + (editLine - editStart);
}
- function findAlignedLines(dv, other) {
- var linesToAlign = [];
- for (var i = 0; i < dv.chunks.length; i++) {
- var chunk = dv.chunks[i];
- linesToAlign.push([chunk.origTo, chunk.editTo, other ? getMatchingOrigLine(chunk.editTo, other.chunks) : null]);
- }
- if (other) {
- chunkLoop: for (var i = 0; i < other.chunks.length; i++) {
- var chunk = other.chunks[i];
- for (var j = 0; j < linesToAlign.length; j++) {
- var diff = linesToAlign[j][1] - chunk.editTo;
- if (diff == 0) continue chunkLoop
- if (diff > 0) break;
+ // Combines information about chunks and widgets/markers to return
+ // an array of lines, in a single editor, that probably need to be
+ // aligned with their counterparts in the editor next to it.
+ function alignableFor(cm, chunks, isOrig) {
+ var tracker = cm.state.trackAlignable
+ var start = cm.firstLine(), trackI = 0
+ var result = []
+ for (var i = 0;; i++) {
+ var chunk = chunks[i]
+ var chunkStart = !chunk ? 1e9 : isOrig ? chunk.origFrom : chunk.editFrom
+ for (; trackI < tracker.alignable.length; trackI += 2) {
+ var n = tracker.alignable[trackI] + 1
+ if (n <= start) continue
+ if (n <= chunkStart) result.push(n)
+ else break
+ }
+ if (!chunk) break
+ result.push(start = isOrig ? chunk.origTo : chunk.editTo)
+ }
+ return result
+ }
+
+ // Given information about alignable lines in two editors, fill in
+ // the result (an array of three-element arrays) to reflect the
+ // lines that need to be aligned with each other.
+ function mergeAlignable(result, origAlignable, chunks, setIndex) {
+ var rI = 0, origI = 0, chunkI = 0, diff = 0
+ outer: for (;; rI++) {
+ var nextR = result[rI], nextO = origAlignable[origI]
+ if (!nextR && nextO == null) break
+
+ var rLine = nextR ? nextR[0] : 1e9, oLine = nextO == null ? 1e9 : nextO
+ while (chunkI < chunks.length) {
+ var chunk = chunks[chunkI]
+ if (chunk.origFrom <= oLine && chunk.origTo > oLine) {
+ origI++
+ rI--
+ continue outer;
+ }
+ if (chunk.editTo > rLine) {
+ if (chunk.editFrom <= rLine) continue outer;
+ break
}
- linesToAlign.splice(j, 0, [getMatchingOrigLine(chunk.editTo, dv.chunks), chunk.editTo, chunk.origTo]);
+ diff += (chunk.origTo - chunk.origFrom) - (chunk.editTo - chunk.editFrom)
+ chunkI++
+ }
+ if (rLine == oLine - diff) {
+ nextR[setIndex] = oLine
+ origI++
+ } else if (rLine < oLine - diff) {
+ nextR[setIndex] = rLine + diff
+ } else {
+ var record = [oLine - diff, null, null]
+ record[setIndex] = oLine
+ result.splice(rI, 0, record)
+ origI++
}
}
- return linesToAlign;
+ }
+
+ function findAlignedLines(dv, other) {
+ var alignable = alignableFor(dv.edit, dv.chunks, false), result = []
+ if (other) for (var i = 0, j = 0; i < other.chunks.length; i++) {
+ var n = other.chunks[i].editTo
+ while (j < alignable.length && alignable[j] < n) j++
+ if (j == alignable.length || alignable[j] != n) alignable.splice(j++, 0, n)
+ }
+ for (var i = 0; i < alignable.length; i++)
+ result.push([alignable[i], null, null])
+
+ mergeAlignable(result, alignableFor(dv.orig, dv.chunks, true), dv.chunks, 1)
+ if (other)
+ mergeAlignable(result, alignableFor(other.orig, other.chunks, true), other.chunks, 2)
+
+ return result
}
function alignChunks(dv, force) {
@@ -371,7 +442,7 @@
aligners[i].clear();
aligners.length = 0;
- var cm = [dv.orig, dv.edit], scroll = [];
+ var cm = [dv.edit, dv.orig], scroll = [];
if (other) cm.push(other.orig);
for (var i = 0; i < cm.length; i++)
scroll.push(cm[i].getScrollInfo().top);
@@ -406,7 +477,7 @@
var elt = document.createElement("div");
elt.className = "CodeMirror-merge-spacer";
elt.style.height = size + "px"; elt.style.minWidth = "1px";
- return cm.addLineWidget(line, elt, {height: size, above: above});
+ return cm.addLineWidget(line, elt, {height: size, above: above, mergeSpacer: true, handleMouseEvents: true});
}
function drawConnectorsForChunk(dv, chunk, sTopOrig, sTopEdit, w) {
@@ -448,9 +519,15 @@
function copyChunk(dv, to, from, chunk) {
if (dv.diffOutOfDate) return;
- var editStart = chunk.editTo > to.lastLine() ? Pos(chunk.editFrom - 1) : Pos(chunk.editFrom, 0)
var origStart = chunk.origTo > from.lastLine() ? Pos(chunk.origFrom - 1) : Pos(chunk.origFrom, 0)
- to.replaceRange(from.getRange(origStart, Pos(chunk.origTo, 0)), editStart, Pos(chunk.editTo, 0))
+ var origEnd = Pos(chunk.origTo, 0)
+ var editStart = chunk.editTo > to.lastLine() ? Pos(chunk.editFrom - 1) : Pos(chunk.editFrom, 0)
+ var editEnd = Pos(chunk.editTo, 0)
+ var handler = dv.mv.options.revertChunk
+ if (handler)
+ handler(dv.mv, from, origStart, origEnd, to, editStart, editEnd)
+ else
+ to.replaceRange(from.getRange(origStart, origEnd), editStart, editEnd)
}
// Merge view, containing 0, 1, or 2 diff views.
@@ -500,8 +577,8 @@
this.aligners = [];
alignChunks(this.left || this.right, true);
}
- if (left) left.registerEvents()
- if (right) right.registerEvents()
+ if (left) left.registerEvents(right)
+ if (right) right.registerEvents(left)
var onResize = function() {
@@ -567,14 +644,15 @@
}
// Operations on diffs
+ var dmp;
+ function getDiff(a, b, ignoreWhitespace) {
+ if (!dmp) dmp = new diff_match_patch();
- var dmp = new diff_match_patch();
- function getDiff(a, b) {
var diff = dmp.diff_main(a, b);
// The library sometimes leaves in empty parts, which confuse the algorithm
for (var i = 0; i < diff.length; ++i) {
var part = diff[i];
- if (!part[1]) {
+ if (ignoreWhitespace ? !/[^ \t]/.test(part[1]) : !part[1]) {
diff.splice(i--, 1);
} else if (i && diff[i - 1][0] == part[0]) {
diff.splice(i--, 1);
@@ -586,12 +664,13 @@
function getChunks(diff) {
var chunks = [];
+ if (!diff.length) return chunks;
var startEdit = 0, startOrig = 0;
var edit = Pos(0, 0), orig = Pos(0, 0);
for (var i = 0; i < diff.length; ++i) {
var part = diff[i], tp = part[0];
if (tp == DIFF_EQUAL) {
- var startOff = startOfLineClean(diff, i) ? 0 : 1;
+ var startOff = !startOfLineClean(diff, i) || edit.line < startEdit || orig.line < startOrig ? 1 : 0;
var cleanFromEdit = edit.line + startOff, cleanFromOrig = orig.line + startOff;
moveOver(edit, part[1], null, orig);
var endOff = endOfLineClean(diff, i) ? 1 : 0;
@@ -614,10 +693,10 @@
function endOfLineClean(diff, i) {
if (i == diff.length - 1) return true;
var next = diff[i + 1][1];
- if (next.length == 1 || next.charCodeAt(0) != 10) return false;
+ if ((next.length == 1 && i < diff.length - 2) || next.charCodeAt(0) != 10) return false;
if (i == diff.length - 2) return true;
next = diff[i + 2][1];
- return next.length > 1 && next.charCodeAt(0) == 10;
+ return (next.length > 1 || i == diff.length - 3) && next.charCodeAt(0) == 10;
}
function startOfLineClean(diff, i) {
@@ -660,6 +739,9 @@
mark.clear();
cm.removeLineClass(from, "wrap", "CodeMirror-merge-collapsed-line");
}
+ if (mark.explicitlyCleared) clear();
+ CodeMirror.on(widget, "click", clear);
+ mark.on("clear", clear);
CodeMirror.on(widget, "click", clear);
return {mark: mark, clear: clear};
}
@@ -751,6 +833,131 @@
return out;
}
+ // Tracks collapsed markers and line widgets, in order to be able to
+ // accurately align the content of two editors.
+
+ var F_WIDGET = 1, F_WIDGET_BELOW = 2, F_MARKER = 4
+
+ function TrackAlignable(cm) {
+ this.cm = cm
+ this.alignable = []
+ this.height = cm.doc.height
+ var self = this
+ cm.on("markerAdded", function(_, marker) {
+ if (!marker.collapsed) return
+ var found = marker.find(1)
+ if (found != null) self.set(found.line, F_MARKER)
+ })
+ cm.on("markerCleared", function(_, marker, _min, max) {
+ if (max != null && marker.collapsed)
+ self.check(max, F_MARKER, self.hasMarker)
+ })
+ cm.on("markerChanged", this.signal.bind(this))
+ cm.on("lineWidgetAdded", function(_, widget, lineNo) {
+ if (widget.mergeSpacer) return
+ if (widget.above) self.set(lineNo - 1, F_WIDGET_BELOW)
+ else self.set(lineNo, F_WIDGET)
+ })
+ cm.on("lineWidgetCleared", function(_, widget, lineNo) {
+ if (widget.mergeSpacer) return
+ if (widget.above) self.check(lineNo - 1, F_WIDGET_BELOW, self.hasWidgetBelow)
+ else self.check(lineNo, F_WIDGET, self.hasWidget)
+ })
+ cm.on("lineWidgetChanged", this.signal.bind(this))
+ cm.on("change", function(_, change) {
+ var start = change.from.line, nBefore = change.to.line - change.from.line
+ var nAfter = change.text.length - 1, end = start + nAfter
+ if (nBefore || nAfter) self.map(start, nBefore, nAfter)
+ self.check(end, F_MARKER, self.hasMarker)
+ if (nBefore || nAfter) self.check(change.from.line, F_MARKER, self.hasMarker)
+ })
+ cm.on("viewportChange", function() {
+ if (self.cm.doc.height != self.height) self.signal()
+ })
+ }
+
+ TrackAlignable.prototype = {
+ signal: function() {
+ CodeMirror.signal(this, "realign")
+ this.height = this.cm.doc.height
+ },
+
+ set: function(n, flags) {
+ var pos = -1
+ for (; pos < this.alignable.length; pos += 2) {
+ var diff = this.alignable[pos] - n
+ if (diff == 0) {
+ if ((this.alignable[pos + 1] & flags) == flags) return
+ this.alignable[pos + 1] |= flags
+ this.signal()
+ return
+ }
+ if (diff > 0) break
+ }
+ this.signal()
+ this.alignable.splice(pos, 0, n, flags)
+ },
+
+ find: function(n) {
+ for (var i = 0; i < this.alignable.length; i += 2)
+ if (this.alignable[i] == n) return i
+ return -1
+ },
+
+ check: function(n, flag, pred) {
+ var found = this.find(n)
+ if (found == -1 || !(this.alignable[found + 1] & flag)) return
+ if (!pred.call(this, n)) {
+ this.signal()
+ var flags = this.alignable[found + 1] & ~flag
+ if (flags) this.alignable[found + 1] = flags
+ else this.alignable.splice(found, 2)
+ }
+ },
+
+ hasMarker: function(n) {
+ var handle = this.cm.getLineHandle(n)
+ if (handle.markedSpans) for (var i = 0; i < handle.markedSpans.length; i++)
+ if (handle.markedSpans[i].mark.collapsed && handle.markedSpans[i].to != null)
+ return true
+ return false
+ },
+
+ hasWidget: function(n) {
+ var handle = this.cm.getLineHandle(n)
+ if (handle.widgets) for (var i = 0; i < handle.widgets.length; i++)
+ if (!handle.widgets[i].above && !handle.widgets[i].mergeSpacer) return true
+ return false
+ },
+
+ hasWidgetBelow: function(n) {
+ if (n == this.cm.lastLine()) return false
+ var handle = this.cm.getLineHandle(n + 1)
+ if (handle.widgets) for (var i = 0; i < handle.widgets.length; i++)
+ if (handle.widgets[i].above && !handle.widgets[i].mergeSpacer) return true
+ return false
+ },
+
+ map: function(from, nBefore, nAfter) {
+ var diff = nAfter - nBefore, to = from + nBefore, widgetFrom = -1, widgetTo = -1
+ for (var i = 0; i < this.alignable.length; i += 2) {
+ var n = this.alignable[i]
+ if (n == from && (this.alignable[i + 1] & F_WIDGET_BELOW)) widgetFrom = i
+ if (n == to && (this.alignable[i + 1] & F_WIDGET_BELOW)) widgetTo = i
+ if (n <= from) continue
+ else if (n < to) this.alignable.splice(i--, 2)
+ else this.alignable[i] += diff
+ }
+ if (widgetFrom > -1) {
+ var flags = this.alignable[widgetFrom + 1]
+ if (flags == F_WIDGET_BELOW) this.alignable.splice(widgetFrom, 2)
+ else this.alignable[widgetFrom + 1] = flags & ~F_WIDGET_BELOW
+ }
+ if (widgetTo > -1 && nAfter)
+ this.set(from + nAfter, F_WIDGET_BELOW)
+ }
+ }
+
function posMin(a, b) { return (a.line - b.line || a.ch - b.ch) < 0 ? a : b; }
function posMax(a, b) { return (a.line - b.line || a.ch - b.ch) > 0 ? a : b; }
function posEq(a, b) { return a.line == b.line && a.ch == b.ch; }
diff --git a/js/codemirror-5.23.0/addon/mode/loadmode.js b/js/codemirror-5.39.0/addon/mode/loadmode.js
similarity index 100%
rename from js/codemirror-5.23.0/addon/mode/loadmode.js
rename to js/codemirror-5.39.0/addon/mode/loadmode.js
diff --git a/js/codemirror-5.23.0/addon/mode/multiplex.js b/js/codemirror-5.39.0/addon/mode/multiplex.js
similarity index 93%
rename from js/codemirror-5.23.0/addon/mode/multiplex.js
rename to js/codemirror-5.39.0/addon/mode/multiplex.js
index 3d8b34c..a084f70 100644
--- a/js/codemirror-5.23.0/addon/mode/multiplex.js
+++ b/js/codemirror-5.39.0/addon/mode/multiplex.js
@@ -50,7 +50,15 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
if (found == stream.pos) {
if (!other.parseDelimiters) stream.match(other.open);
state.innerActive = other;
- state.inner = CodeMirror.startState(other.mode, outer.indent ? outer.indent(state.outer, "") : 0);
+
+ // Get the outer indent, making sure to handle CodeMirror.Pass
+ var outerIndent = 0;
+ if (outer.indent) {
+ var possibleOuterIndent = outer.indent(state.outer, "");
+ if (possibleOuterIndent !== CodeMirror.Pass) outerIndent = possibleOuterIndent;
+ }
+
+ state.inner = CodeMirror.startState(other.mode, outerIndent);
return other.delimStyle && (other.delimStyle + " " + other.delimStyle + "-open");
} else if (found != -1 && found < cutOff) {
cutOff = found;
diff --git a/js/codemirror-5.23.0/addon/mode/multiplex_test.js b/js/codemirror-5.39.0/addon/mode/multiplex_test.js
similarity index 100%
rename from js/codemirror-5.23.0/addon/mode/multiplex_test.js
rename to js/codemirror-5.39.0/addon/mode/multiplex_test.js
diff --git a/js/codemirror-5.23.0/addon/mode/overlay.js b/js/codemirror-5.39.0/addon/mode/overlay.js
similarity index 100%
rename from js/codemirror-5.23.0/addon/mode/overlay.js
rename to js/codemirror-5.39.0/addon/mode/overlay.js
diff --git a/js/codemirror-5.23.0/addon/mode/simple.js b/js/codemirror-5.39.0/addon/mode/simple.js
similarity index 95%
rename from js/codemirror-5.23.0/addon/mode/simple.js
rename to js/codemirror-5.39.0/addon/mode/simple.js
index df66336..c0f8010 100644
--- a/js/codemirror-5.23.0/addon/mode/simple.js
+++ b/js/codemirror-5.39.0/addon/mode/simple.js
@@ -77,6 +77,7 @@
function asToken(val) {
if (!val) return null;
+ if (val.apply) return val
if (typeof val == "string") return val.replace(/\./g, " ");
var result = [];
for (var i = 0; i < val.length; i++)
@@ -133,17 +134,19 @@
state.indent.push(stream.indentation() + config.indentUnit);
if (rule.data.dedent)
state.indent.pop();
- if (matches.length > 2) {
+ var token = rule.token
+ if (token && token.apply) token = token(matches)
+ if (matches.length > 2 && rule.token && typeof rule.token != "string") {
state.pending = [];
for (var j = 2; j < matches.length; j++)
if (matches[j])
state.pending.push({text: matches[j], token: rule.token[j - 1]});
stream.backUp(matches[0].length - (matches[1] ? matches[1].length : 0));
- return rule.token[0];
- } else if (rule.token && rule.token.join) {
- return rule.token[0];
+ return token[0];
+ } else if (token && token.join) {
+ return token[0];
} else {
- return rule.token;
+ return token;
}
}
}
diff --git a/js/codemirror-5.23.0/addon/runmode/colorize.js b/js/codemirror-5.39.0/addon/runmode/colorize.js
similarity index 100%
rename from js/codemirror-5.23.0/addon/runmode/colorize.js
rename to js/codemirror-5.39.0/addon/runmode/colorize.js
diff --git a/js/codemirror-5.23.0/addon/runmode/runmode-standalone.js b/js/codemirror-5.39.0/addon/runmode/runmode-standalone.js
similarity index 99%
rename from js/codemirror-5.23.0/addon/runmode/runmode-standalone.js
rename to js/codemirror-5.39.0/addon/runmode/runmode-standalone.js
index f4f352c..1bd808c 100644
--- a/js/codemirror-5.23.0/addon/runmode/runmode-standalone.js
+++ b/js/codemirror-5.39.0/addon/runmode/runmode-standalone.js
@@ -65,7 +65,8 @@ StringStream.prototype = {
this.lineStart += n;
try { return inner(); }
finally { this.lineStart -= n; }
- }
+ },
+ lookAhead: function() { return null }
};
CodeMirror.StringStream = StringStream;
diff --git a/js/codemirror-5.23.0/addon/runmode/runmode.js b/js/codemirror-5.39.0/addon/runmode/runmode.js
similarity index 100%
rename from js/codemirror-5.23.0/addon/runmode/runmode.js
rename to js/codemirror-5.39.0/addon/runmode/runmode.js
diff --git a/js/codemirror-5.23.0/addon/runmode/runmode.node.js b/js/codemirror-5.39.0/addon/runmode/runmode.node.js
similarity index 89%
rename from js/codemirror-5.23.0/addon/runmode/runmode.node.js
rename to js/codemirror-5.39.0/addon/runmode/runmode.node.js
index b22a518..21c7269 100644
--- a/js/codemirror-5.23.0/addon/runmode/runmode.node.js
+++ b/js/codemirror-5.39.0/addon/runmode/runmode.node.js
@@ -7,7 +7,7 @@ function splitLines(string){return string.split(/\r\n?|\n/);};
// Counts the column offset in a string, taking tabs into account.
// Used mostly to find indentation.
-var countColumn = function(string, end, tabSize, startIndex, startValue) {
+var countColumn = exports.countColumn = function(string, end, tabSize, startIndex, startValue) {
if (end == null) {
end = string.search(/[^\s\u00a0]/);
if (end == -1) end = string.length;
@@ -22,12 +22,13 @@ var countColumn = function(string, end, tabSize, startIndex, startValue) {
}
};
-function StringStream(string, tabSize) {
+function StringStream(string, tabSize, context) {
this.pos = this.start = 0;
this.string = string;
this.tabSize = tabSize || 8;
this.lastColumnPos = this.lastColumnValue = 0;
this.lineStart = 0;
+ this.context = context
};
StringStream.prototype = {
@@ -91,6 +92,10 @@ StringStream.prototype = {
this.lineStart += n;
try { return inner(); }
finally { this.lineStart -= n; }
+ },
+ lookAhead: function(n) {
+ var line = this.context.line + n
+ return line >= this.context.lines.length ? null : this.context.lines[line]
}
};
exports.StringStream = StringStream;
@@ -158,14 +163,27 @@ exports.getMode = function(options, spec) {
return modeObj;
};
+
+exports.innerMode = function(mode, state) {
+ var info;
+ while (mode.innerMode) {
+ info = mode.innerMode(state);
+ if (!info || info.mode == mode) break;
+ state = info.state;
+ mode = info.mode;
+ }
+ return info || {mode: mode, state: state};
+}
+
exports.registerHelper = exports.registerGlobalHelper = Math.min;
exports.runMode = function(string, modespec, callback, options) {
var mode = exports.getMode({indentUnit: 2}, modespec);
var lines = splitLines(string), state = (options && options.state) || exports.startState(mode);
- for (var i = 0, e = lines.length; i < e; ++i) {
+ var context = {lines: lines, line: 0}
+ for (var i = 0, e = lines.length; i < e; ++i, ++context.line) {
if (i) callback("\n");
- var stream = new exports.StringStream(lines[i]);
+ var stream = new exports.StringStream(lines[i], 4, context);
if (!stream.string && mode.blankLine) mode.blankLine(state);
while (!stream.eol()) {
var style = mode.token(stream, state);
diff --git a/js/codemirror-5.23.0/addon/scroll/annotatescrollbar.js b/js/codemirror-5.39.0/addon/scroll/annotatescrollbar.js
similarity index 94%
rename from js/codemirror-5.23.0/addon/scroll/annotatescrollbar.js
rename to js/codemirror-5.39.0/addon/scroll/annotatescrollbar.js
index 5e748e8..f2276fc 100644
--- a/js/codemirror-5.23.0/addon/scroll/annotatescrollbar.js
+++ b/js/codemirror-5.39.0/addon/scroll/annotatescrollbar.js
@@ -77,17 +77,21 @@
curLine = pos.line;
curLineObj = cm.getLineHandle(curLine);
}
- if (wrapping && curLineObj.height > singleLineH)
+ if ((curLineObj.widgets && curLineObj.widgets.length) ||
+ (wrapping && curLineObj.height > singleLineH))
return cm.charCoords(pos, "local")[top ? "top" : "bottom"];
var topY = cm.heightAtLine(curLineObj, "local");
return topY + (top ? 0 : curLineObj.height);
}
+ var lastLine = cm.lastLine()
if (cm.display.barWidth) for (var i = 0, nextTop; i < anns.length; i++) {
var ann = anns[i];
+ if (ann.to.line > lastLine) continue;
var top = nextTop || getY(ann.from, true) * hScale;
var bottom = getY(ann.to, false) * hScale;
while (i < anns.length - 1) {
+ if (anns[i + 1].to.line > lastLine) break;
nextTop = getY(anns[i + 1].from, true) * hScale;
if (nextTop > bottom + .9) break;
ann = anns[++i];
diff --git a/js/codemirror-5.23.0/addon/scroll/scrollpastend.js b/js/codemirror-5.39.0/addon/scroll/scrollpastend.js
similarity index 100%
rename from js/codemirror-5.23.0/addon/scroll/scrollpastend.js
rename to js/codemirror-5.39.0/addon/scroll/scrollpastend.js
diff --git a/js/codemirror-5.23.0/addon/scroll/simplescrollbars.css b/js/codemirror-5.39.0/addon/scroll/simplescrollbars.css
similarity index 100%
rename from js/codemirror-5.23.0/addon/scroll/simplescrollbars.css
rename to js/codemirror-5.39.0/addon/scroll/simplescrollbars.css
diff --git a/js/codemirror-5.23.0/addon/scroll/simplescrollbars.js b/js/codemirror-5.39.0/addon/scroll/simplescrollbars.js
similarity index 100%
rename from js/codemirror-5.23.0/addon/scroll/simplescrollbars.js
rename to js/codemirror-5.39.0/addon/scroll/simplescrollbars.js
diff --git a/js/codemirror-5.23.0/addon/search/jump-to-line.js b/js/codemirror-5.39.0/addon/search/jump-to-line.js
similarity index 100%
rename from js/codemirror-5.23.0/addon/search/jump-to-line.js
rename to js/codemirror-5.39.0/addon/search/jump-to-line.js
diff --git a/js/codemirror-5.23.0/addon/search/match-highlighter.js b/js/codemirror-5.39.0/addon/search/match-highlighter.js
similarity index 98%
rename from js/codemirror-5.23.0/addon/search/match-highlighter.js
rename to js/codemirror-5.39.0/addon/search/match-highlighter.js
index 73ba0e0..260cdeb 100644
--- a/js/codemirror-5.23.0/addon/search/match-highlighter.js
+++ b/js/codemirror-5.39.0/addon/search/match-highlighter.js
@@ -90,7 +90,7 @@
var state = cm.state.matchHighlighter;
cm.addOverlay(state.overlay = makeOverlay(query, hasBoundary, style));
if (state.options.annotateScrollbar && cm.showMatchesOnScrollbar) {
- var searchFor = hasBoundary ? new RegExp("\\b" + query + "\\b") : query;
+ var searchFor = hasBoundary ? new RegExp("\\b" + query.replace(/[\\\[.+*?(){|^$]/g, "\\$&") + "\\b") : query;
state.matchesonscroll = cm.showMatchesOnScrollbar(searchFor, false,
{className: "CodeMirror-selection-highlight-scrollbar"});
}
diff --git a/js/codemirror-5.23.0/addon/search/matchesonscrollbar.css b/js/codemirror-5.39.0/addon/search/matchesonscrollbar.css
similarity index 100%
rename from js/codemirror-5.23.0/addon/search/matchesonscrollbar.css
rename to js/codemirror-5.39.0/addon/search/matchesonscrollbar.css
diff --git a/js/codemirror-5.23.0/addon/search/matchesonscrollbar.js b/js/codemirror-5.39.0/addon/search/matchesonscrollbar.js
similarity index 100%
rename from js/codemirror-5.23.0/addon/search/matchesonscrollbar.js
rename to js/codemirror-5.39.0/addon/search/matchesonscrollbar.js
diff --git a/js/codemirror-5.23.0/addon/search/search.js b/js/codemirror-5.39.0/addon/search/search.js
similarity index 90%
rename from js/codemirror-5.23.0/addon/search/search.js
rename to js/codemirror-5.39.0/addon/search/search.js
index 753b1af..4059ccd 100644
--- a/js/codemirror-5.23.0/addon/search/search.js
+++ b/js/codemirror-5.39.0/addon/search/search.js
@@ -54,7 +54,7 @@
function getSearchCursor(cm, query, pos) {
// Heuristic: if the query string is all lowercase, do a case insensitive search.
- return cm.getSearchCursor(query, pos, queryCaseInsensitive(query));
+ return cm.getSearchCursor(query, pos, {caseFold: queryCaseInsensitive(query), multiline: true});
}
function persistentDialog(cm, text, deflt, onEnter, onKeyDown) {
@@ -99,7 +99,7 @@
}
var queryDialog =
- 'Search: (Use /re/ syntax for regexp search) ';
+ 'Search: (Use /re/ syntax for regexp search) ';
function startSearch(cm, state, query) {
state.queryText = query;
@@ -117,6 +117,7 @@
var state = getSearchState(cm);
if (state.query) return findNext(cm, rev);
var q = cm.getSelection() || state.lastQuery;
+ if (q instanceof RegExp && q.source == "x^") q = null
if (persistent && cm.openDialog) {
var hiding = null
var searchNext = function(query, event) {
@@ -137,8 +138,7 @@
};
persistentDialog(cm, queryDialog, q, searchNext, function(event, query) {
var keyName = CodeMirror.keyName(event)
- var cmd = CodeMirror.keyMap[cm.getOption("keyMap")][keyName]
- if (!cmd) cmd = cm.getOption('extraKeys')[keyName]
+ var extra = cm.getOption('extraKeys'), cmd = (extra && extra[keyName]) || CodeMirror.keyMap[cm.getOption("keyMap")][keyName]
if (cmd == "findNext" || cmd == "findPrev" ||
cmd == "findPersistentNext" || cmd == "findPersistentPrev") {
CodeMirror.e_stop(event);
@@ -188,8 +188,8 @@
var replaceQueryDialog =
' (Use /re/ syntax for regexp search) ';
- var replacementQueryDialog = 'With: ';
- var doReplaceConfirm = "Replace? Yes No All Stop ";
+ var replacementQueryDialog = 'With: ';
+ var doReplaceConfirm = 'Replace? Yes No All Stop ';
function replaceAll(cm, query, text) {
cm.operation(function() {
@@ -205,7 +205,7 @@
function replace(cm, all) {
if (cm.getOption("readOnly")) return;
var query = cm.getSelection() || getSearchState(cm).lastQuery;
- var dialogText = all ? "Replace all:" : "Replace:"
+ var dialogText = '' + (all ? 'Replace all:' : 'Replace:') + ' ';
dialog(cm, dialogText + replaceQueryDialog, dialogText, query, function(query) {
if (!query) return;
query = parseQuery(query);
diff --git a/js/codemirror-5.39.0/addon/search/searchcursor.js b/js/codemirror-5.39.0/addon/search/searchcursor.js
new file mode 100644
index 0000000..e606c5e
--- /dev/null
+++ b/js/codemirror-5.39.0/addon/search/searchcursor.js
@@ -0,0 +1,293 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(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"
+ var Pos = CodeMirror.Pos
+
+ function regexpFlags(regexp) {
+ var flags = regexp.flags
+ return flags != null ? flags : (regexp.ignoreCase ? "i" : "")
+ + (regexp.global ? "g" : "")
+ + (regexp.multiline ? "m" : "")
+ }
+
+ function ensureFlags(regexp, flags) {
+ var current = regexpFlags(regexp), target = current
+ for (var i = 0; i < flags.length; i++) if (target.indexOf(flags.charAt(i)) == -1)
+ target += flags.charAt(i)
+ return current == target ? regexp : new RegExp(regexp.source, target)
+ }
+
+ function maybeMultiline(regexp) {
+ return /\\s|\\n|\n|\\W|\\D|\[\^/.test(regexp.source)
+ }
+
+ function searchRegexpForward(doc, regexp, start) {
+ regexp = ensureFlags(regexp, "g")
+ for (var line = start.line, ch = start.ch, last = doc.lastLine(); line <= last; line++, ch = 0) {
+ regexp.lastIndex = ch
+ var string = doc.getLine(line), match = regexp.exec(string)
+ if (match)
+ return {from: Pos(line, match.index),
+ to: Pos(line, match.index + match[0].length),
+ match: match}
+ }
+ }
+
+ function searchRegexpForwardMultiline(doc, regexp, start) {
+ if (!maybeMultiline(regexp)) return searchRegexpForward(doc, regexp, start)
+
+ regexp = ensureFlags(regexp, "gm")
+ var string, chunk = 1
+ for (var line = start.line, last = doc.lastLine(); line <= last;) {
+ // This grows the search buffer in exponentially-sized chunks
+ // between matches, so that nearby matches are fast and don't
+ // require concatenating the whole document (in case we're
+ // searching for something that has tons of matches), but at the
+ // same time, the amount of retries is limited.
+ for (var i = 0; i < chunk; i++) {
+ if (line > last) break
+ var curLine = doc.getLine(line++)
+ string = string == null ? curLine : string + "\n" + curLine
+ }
+ chunk = chunk * 2
+ regexp.lastIndex = start.ch
+ var match = regexp.exec(string)
+ if (match) {
+ var before = string.slice(0, match.index).split("\n"), inside = match[0].split("\n")
+ var startLine = start.line + before.length - 1, startCh = before[before.length - 1].length
+ return {from: Pos(startLine, startCh),
+ to: Pos(startLine + inside.length - 1,
+ inside.length == 1 ? startCh + inside[0].length : inside[inside.length - 1].length),
+ match: match}
+ }
+ }
+ }
+
+ function lastMatchIn(string, regexp) {
+ var cutOff = 0, match
+ for (;;) {
+ regexp.lastIndex = cutOff
+ var newMatch = regexp.exec(string)
+ if (!newMatch) return match
+ match = newMatch
+ cutOff = match.index + (match[0].length || 1)
+ if (cutOff == string.length) return match
+ }
+ }
+
+ function searchRegexpBackward(doc, regexp, start) {
+ regexp = ensureFlags(regexp, "g")
+ for (var line = start.line, ch = start.ch, first = doc.firstLine(); line >= first; line--, ch = -1) {
+ var string = doc.getLine(line)
+ if (ch > -1) string = string.slice(0, ch)
+ var match = lastMatchIn(string, regexp)
+ if (match)
+ return {from: Pos(line, match.index),
+ to: Pos(line, match.index + match[0].length),
+ match: match}
+ }
+ }
+
+ function searchRegexpBackwardMultiline(doc, regexp, start) {
+ regexp = ensureFlags(regexp, "gm")
+ var string, chunk = 1
+ for (var line = start.line, first = doc.firstLine(); line >= first;) {
+ for (var i = 0; i < chunk; i++) {
+ var curLine = doc.getLine(line--)
+ string = string == null ? curLine.slice(0, start.ch) : curLine + "\n" + string
+ }
+ chunk *= 2
+
+ var match = lastMatchIn(string, regexp)
+ if (match) {
+ var before = string.slice(0, match.index).split("\n"), inside = match[0].split("\n")
+ var startLine = line + before.length, startCh = before[before.length - 1].length
+ return {from: Pos(startLine, startCh),
+ to: Pos(startLine + inside.length - 1,
+ inside.length == 1 ? startCh + inside[0].length : inside[inside.length - 1].length),
+ match: match}
+ }
+ }
+ }
+
+ var doFold, noFold
+ if (String.prototype.normalize) {
+ doFold = function(str) { return str.normalize("NFD").toLowerCase() }
+ noFold = function(str) { return str.normalize("NFD") }
+ } else {
+ doFold = function(str) { return str.toLowerCase() }
+ noFold = function(str) { return str }
+ }
+
+ // Maps a position in a case-folded line back to a position in the original line
+ // (compensating for codepoints increasing in number during folding)
+ function adjustPos(orig, folded, pos, foldFunc) {
+ if (orig.length == folded.length) return pos
+ for (var min = 0, max = pos + Math.max(0, orig.length - folded.length);;) {
+ if (min == max) return min
+ var mid = (min + max) >> 1
+ var len = foldFunc(orig.slice(0, mid)).length
+ if (len == pos) return mid
+ else if (len > pos) max = mid
+ else min = mid + 1
+ }
+ }
+
+ function searchStringForward(doc, query, start, caseFold) {
+ // Empty string would match anything and never progress, so we
+ // define it to match nothing instead.
+ if (!query.length) return null
+ var fold = caseFold ? doFold : noFold
+ var lines = fold(query).split(/\r|\n\r?/)
+
+ search: for (var line = start.line, ch = start.ch, last = doc.lastLine() + 1 - lines.length; line <= last; line++, ch = 0) {
+ var orig = doc.getLine(line).slice(ch), string = fold(orig)
+ if (lines.length == 1) {
+ var found = string.indexOf(lines[0])
+ if (found == -1) continue search
+ var start = adjustPos(orig, string, found, fold) + ch
+ return {from: Pos(line, adjustPos(orig, string, found, fold) + ch),
+ to: Pos(line, adjustPos(orig, string, found + lines[0].length, fold) + ch)}
+ } else {
+ var cutFrom = string.length - lines[0].length
+ if (string.slice(cutFrom) != lines[0]) continue search
+ for (var i = 1; i < lines.length - 1; i++)
+ if (fold(doc.getLine(line + i)) != lines[i]) continue search
+ var end = doc.getLine(line + lines.length - 1), endString = fold(end), lastLine = lines[lines.length - 1]
+ if (endString.slice(0, lastLine.length) != lastLine) continue search
+ return {from: Pos(line, adjustPos(orig, string, cutFrom, fold) + ch),
+ to: Pos(line + lines.length - 1, adjustPos(end, endString, lastLine.length, fold))}
+ }
+ }
+ }
+
+ function searchStringBackward(doc, query, start, caseFold) {
+ if (!query.length) return null
+ var fold = caseFold ? doFold : noFold
+ var lines = fold(query).split(/\r|\n\r?/)
+
+ search: for (var line = start.line, ch = start.ch, first = doc.firstLine() - 1 + lines.length; line >= first; line--, ch = -1) {
+ var orig = doc.getLine(line)
+ if (ch > -1) orig = orig.slice(0, ch)
+ var string = fold(orig)
+ if (lines.length == 1) {
+ var found = string.lastIndexOf(lines[0])
+ if (found == -1) continue search
+ return {from: Pos(line, adjustPos(orig, string, found, fold)),
+ to: Pos(line, adjustPos(orig, string, found + lines[0].length, fold))}
+ } else {
+ var lastLine = lines[lines.length - 1]
+ if (string.slice(0, lastLine.length) != lastLine) continue search
+ for (var i = 1, start = line - lines.length + 1; i < lines.length - 1; i++)
+ if (fold(doc.getLine(start + i)) != lines[i]) continue search
+ var top = doc.getLine(line + 1 - lines.length), topString = fold(top)
+ if (topString.slice(topString.length - lines[0].length) != lines[0]) continue search
+ return {from: Pos(line + 1 - lines.length, adjustPos(top, topString, top.length - lines[0].length, fold)),
+ to: Pos(line, adjustPos(orig, string, lastLine.length, fold))}
+ }
+ }
+ }
+
+ function SearchCursor(doc, query, pos, options) {
+ this.atOccurrence = false
+ this.doc = doc
+ pos = pos ? doc.clipPos(pos) : Pos(0, 0)
+ this.pos = {from: pos, to: pos}
+
+ var caseFold
+ if (typeof options == "object") {
+ caseFold = options.caseFold
+ } else { // Backwards compat for when caseFold was the 4th argument
+ caseFold = options
+ options = null
+ }
+
+ if (typeof query == "string") {
+ if (caseFold == null) caseFold = false
+ this.matches = function(reverse, pos) {
+ return (reverse ? searchStringBackward : searchStringForward)(doc, query, pos, caseFold)
+ }
+ } else {
+ query = ensureFlags(query, "gm")
+ if (!options || options.multiline !== false)
+ this.matches = function(reverse, pos) {
+ return (reverse ? searchRegexpBackwardMultiline : searchRegexpForwardMultiline)(doc, query, pos)
+ }
+ else
+ this.matches = function(reverse, pos) {
+ return (reverse ? searchRegexpBackward : searchRegexpForward)(doc, query, pos)
+ }
+ }
+ }
+
+ SearchCursor.prototype = {
+ findNext: function() {return this.find(false)},
+ findPrevious: function() {return this.find(true)},
+
+ find: function(reverse) {
+ var result = this.matches(reverse, this.doc.clipPos(reverse ? this.pos.from : this.pos.to))
+
+ // Implements weird auto-growing behavior on null-matches for
+ // backwards-compatiblity with the vim code (unfortunately)
+ while (result && CodeMirror.cmpPos(result.from, result.to) == 0) {
+ if (reverse) {
+ if (result.from.ch) result.from = Pos(result.from.line, result.from.ch - 1)
+ else if (result.from.line == this.doc.firstLine()) result = null
+ else result = this.matches(reverse, this.doc.clipPos(Pos(result.from.line - 1)))
+ } else {
+ if (result.to.ch < this.doc.getLine(result.to.line).length) result.to = Pos(result.to.line, result.to.ch + 1)
+ else if (result.to.line == this.doc.lastLine()) result = null
+ else result = this.matches(reverse, Pos(result.to.line + 1, 0))
+ }
+ }
+
+ if (result) {
+ this.pos = result
+ this.atOccurrence = true
+ return this.pos.match || true
+ } else {
+ var end = Pos(reverse ? this.doc.firstLine() : this.doc.lastLine() + 1, 0)
+ this.pos = {from: end, to: end}
+ return this.atOccurrence = false
+ }
+ },
+
+ from: function() {if (this.atOccurrence) return this.pos.from},
+ to: function() {if (this.atOccurrence) return this.pos.to},
+
+ replace: function(newText, origin) {
+ if (!this.atOccurrence) return
+ var lines = CodeMirror.splitLines(newText)
+ this.doc.replaceRange(lines, this.pos.from, this.pos.to, origin)
+ this.pos.to = Pos(this.pos.from.line + lines.length - 1,
+ lines[lines.length - 1].length + (lines.length == 1 ? this.pos.from.ch : 0))
+ }
+ }
+
+ CodeMirror.defineExtension("getSearchCursor", function(query, pos, caseFold) {
+ return new SearchCursor(this.doc, query, pos, caseFold)
+ })
+ CodeMirror.defineDocExtension("getSearchCursor", function(query, pos, caseFold) {
+ return new SearchCursor(this, query, pos, caseFold)
+ })
+
+ CodeMirror.defineExtension("selectMatches", function(query, caseFold) {
+ var ranges = []
+ var cur = this.getSearchCursor(query, this.getCursor("from"), caseFold)
+ while (cur.findNext()) {
+ if (CodeMirror.cmpPos(cur.to(), this.getCursor("to")) > 0) break
+ ranges.push({anchor: cur.from(), head: cur.to()})
+ }
+ if (ranges.length)
+ this.setSelections(ranges, 0)
+ })
+});
diff --git a/js/codemirror-5.23.0/addon/selection/active-line.js b/js/codemirror-5.39.0/addon/selection/active-line.js
similarity index 100%
rename from js/codemirror-5.23.0/addon/selection/active-line.js
rename to js/codemirror-5.39.0/addon/selection/active-line.js
diff --git a/js/codemirror-5.23.0/addon/selection/mark-selection.js b/js/codemirror-5.39.0/addon/selection/mark-selection.js
similarity index 94%
rename from js/codemirror-5.23.0/addon/selection/mark-selection.js
rename to js/codemirror-5.39.0/addon/selection/mark-selection.js
index 5c42d21..1602acc 100644
--- a/js/codemirror-5.23.0/addon/selection/mark-selection.js
+++ b/js/codemirror-5.39.0/addon/selection/mark-selection.js
@@ -34,11 +34,12 @@
});
function onCursorActivity(cm) {
- cm.operation(function() { update(cm); });
+ if (cm.state.markedSelection)
+ cm.operation(function() { update(cm); });
}
function onChange(cm) {
- if (cm.state.markedSelection.length)
+ if (cm.state.markedSelection && cm.state.markedSelection.length)
cm.operation(function() { clear(cm); });
}
@@ -85,7 +86,7 @@
if (!array.length) return coverRange(cm, from, to);
var coverStart = array[0].find(), coverEnd = array[array.length - 1].find();
- if (!coverStart || !coverEnd || to.line - from.line < CHUNK_SIZE ||
+ if (!coverStart || !coverEnd || to.line - from.line <= CHUNK_SIZE ||
cmp(from, coverEnd.to) >= 0 || cmp(to, coverStart.from) <= 0)
return reset(cm);
diff --git a/js/codemirror-5.23.0/addon/selection/selection-pointer.js b/js/codemirror-5.39.0/addon/selection/selection-pointer.js
similarity index 100%
rename from js/codemirror-5.23.0/addon/selection/selection-pointer.js
rename to js/codemirror-5.39.0/addon/selection/selection-pointer.js
diff --git a/js/codemirror-5.23.0/addon/tern/tern.css b/js/codemirror-5.39.0/addon/tern/tern.css
similarity index 100%
rename from js/codemirror-5.23.0/addon/tern/tern.css
rename to js/codemirror-5.39.0/addon/tern/tern.css
diff --git a/js/codemirror-5.23.0/addon/tern/tern.js b/js/codemirror-5.39.0/addon/tern/tern.js
similarity index 96%
rename from js/codemirror-5.23.0/addon/tern/tern.js
rename to js/codemirror-5.39.0/addon/tern/tern.js
index efdf2ed..6276b53 100644
--- a/js/codemirror-5.23.0/addon/tern/tern.js
+++ b/js/codemirror-5.39.0/addon/tern/tern.js
@@ -334,7 +334,11 @@
tip.appendChild(document.createTextNode(tp.rettype ? ") ->\u00a0" : ")"));
if (tp.rettype) tip.appendChild(elt("span", cls + "type", tp.rettype));
var place = cm.cursorCoords(null, "page");
- ts.activeArgHints = makeTooltip(place.right + 1, place.bottom, tip);
+ var tooltip = ts.activeArgHints = makeTooltip(place.right + 1, place.bottom, tip)
+ setTimeout(function() {
+ tooltip.clear = onEditorActivity(cm, function() {
+ if (ts.activeArgHints == tooltip) closeArgHints(ts) })
+ }, 20)
}
function parseFnType(text) {
@@ -567,7 +571,7 @@
return {type: "part",
name: data.name,
offsetLines: from.line,
- text: doc.getRange(from, Pos(endLine, 0))};
+ text: doc.getRange(from, Pos(endLine, end.line == endLine ? null : 0))};
}
// Generic utilities
@@ -604,24 +608,33 @@
}
function clear() {
cm.state.ternTooltip = null;
- if (!tip.parentNode) return;
- cm.off("cursorActivity", clear);
- cm.off('blur', clear);
- cm.off('scroll', clear);
- fadeOut(tip);
+ if (tip.parentNode) fadeOut(tip)
+ clearActivity()
}
var mouseOnTip = false, old = false;
CodeMirror.on(tip, "mousemove", function() { mouseOnTip = true; });
CodeMirror.on(tip, "mouseout", function(e) {
- if (!CodeMirror.contains(tip, e.relatedTarget || e.toElement)) {
+ var related = e.relatedTarget || e.toElement
+ if (!related || !CodeMirror.contains(tip, related)) {
if (old) clear();
else mouseOnTip = false;
}
});
setTimeout(maybeClear, ts.options.hintDelay ? ts.options.hintDelay : 1700);
- cm.on("cursorActivity", clear);
- cm.on('blur', clear);
- cm.on('scroll', clear);
+ var clearActivity = onEditorActivity(cm, clear)
+ }
+
+ function onEditorActivity(cm, f) {
+ cm.on("cursorActivity", f)
+ cm.on("blur", f)
+ cm.on("scroll", f)
+ cm.on("setDoc", f)
+ return function() {
+ cm.off("cursorActivity", f)
+ cm.off("blur", f)
+ cm.off("scroll", f)
+ cm.off("setDoc", f)
+ }
}
function makeTooltip(x, y, content) {
@@ -650,7 +663,11 @@
}
function closeArgHints(ts) {
- if (ts.activeArgHints) { remove(ts.activeArgHints); ts.activeArgHints = null; }
+ if (ts.activeArgHints) {
+ if (ts.activeArgHints.clear) ts.activeArgHints.clear()
+ remove(ts.activeArgHints)
+ ts.activeArgHints = null
+ }
}
function docValue(ts, doc) {
diff --git a/js/codemirror-5.23.0/addon/tern/worker.js b/js/codemirror-5.39.0/addon/tern/worker.js
similarity index 100%
rename from js/codemirror-5.23.0/addon/tern/worker.js
rename to js/codemirror-5.39.0/addon/tern/worker.js
diff --git a/js/codemirror-5.23.0/addon/wrap/hardwrap.js b/js/codemirror-5.39.0/addon/wrap/hardwrap.js
similarity index 100%
rename from js/codemirror-5.23.0/addon/wrap/hardwrap.js
rename to js/codemirror-5.39.0/addon/wrap/hardwrap.js
diff --git a/js/codemirror-5.23.0/bin/authors.sh b/js/codemirror-5.39.0/bin/authors.sh
old mode 100755
new mode 100644
similarity index 79%
rename from js/codemirror-5.23.0/bin/authors.sh
rename to js/codemirror-5.39.0/bin/authors.sh
index b3ee99c..3f228c1
--- a/js/codemirror-5.23.0/bin/authors.sh
+++ b/js/codemirror-5.39.0/bin/authors.sh
@@ -1,6 +1,6 @@
# Combine existing list of authors with everyone known in git, sort, add header.
tail --lines=+3 AUTHORS > AUTHORS.tmp
-git log --format='%aN' >> AUTHORS.tmp
+git log --format='%aN' | grep -v "Piët Delport" >> AUTHORS.tmp
echo -e "List of CodeMirror contributors. Updated before every release.\n" > AUTHORS
sort -u AUTHORS.tmp >> AUTHORS
rm -f AUTHORS.tmp
diff --git a/js/codemirror-5.23.0/bin/lint b/js/codemirror-5.39.0/bin/lint
old mode 100755
new mode 100644
similarity index 100%
rename from js/codemirror-5.23.0/bin/lint
rename to js/codemirror-5.39.0/bin/lint
diff --git a/js/codemirror-5.23.0/bin/release b/js/codemirror-5.39.0/bin/release
old mode 100755
new mode 100644
similarity index 100%
rename from js/codemirror-5.23.0/bin/release
rename to js/codemirror-5.39.0/bin/release
diff --git a/js/codemirror-5.23.0/bin/source-highlight b/js/codemirror-5.39.0/bin/source-highlight
old mode 100755
new mode 100644
similarity index 100%
rename from js/codemirror-5.23.0/bin/source-highlight
rename to js/codemirror-5.39.0/bin/source-highlight
diff --git a/js/codemirror-5.23.0/bin/upload-release.js b/js/codemirror-5.39.0/bin/upload-release.js
similarity index 100%
rename from js/codemirror-5.23.0/bin/upload-release.js
rename to js/codemirror-5.39.0/bin/upload-release.js
diff --git a/js/codemirror-5.23.0/demo/activeline.html b/js/codemirror-5.39.0/demo/activeline.html
similarity index 100%
rename from js/codemirror-5.23.0/demo/activeline.html
rename to js/codemirror-5.39.0/demo/activeline.html
diff --git a/js/codemirror-5.23.0/demo/anywordhint.html b/js/codemirror-5.39.0/demo/anywordhint.html
similarity index 100%
rename from js/codemirror-5.23.0/demo/anywordhint.html
rename to js/codemirror-5.39.0/demo/anywordhint.html
diff --git a/js/codemirror-5.23.0/demo/bidi.html b/js/codemirror-5.39.0/demo/bidi.html
similarity index 63%
rename from js/codemirror-5.23.0/demo/bidi.html
rename to js/codemirror-5.39.0/demo/bidi.html
index 6dd73be..645e648 100644
--- a/js/codemirror-5.23.0/demo/bidi.html
+++ b/js/codemirror-5.39.0/demo/bidi.html
@@ -8,8 +8,9 @@
+ .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
+ fieldset {border: none}
+
CodeMirror
@@ -25,8 +26,8 @@
Bi-directional Text Demo
-
+
+
value (string or Doc)
@@ -53,22 +54,53 @@ Bi-directional Text Demo
سيتم تعيين كل من cm-s-foo و cm-s-bar
الطبقات إلى المحرر.
-
+
+
+ Editor default direction:
+ LTR
+ RTL
+
+
+ HTML document direction:
+ LTR
+ RTL
+
+
+ Use visual order for arrow key movement.
+
+
Demonstration of bi-directional text support. See
the related
blog post for more background.
- Note: There is
- a known
- bug with cursor motion and mouse clicks in bi-directional lines
- that are line wrapped.
-
diff --git a/js/codemirror-5.23.0/demo/btree.html b/js/codemirror-5.39.0/demo/btree.html
similarity index 100%
rename from js/codemirror-5.23.0/demo/btree.html
rename to js/codemirror-5.39.0/demo/btree.html
diff --git a/js/codemirror-5.23.0/demo/buffers.html b/js/codemirror-5.39.0/demo/buffers.html
similarity index 100%
rename from js/codemirror-5.23.0/demo/buffers.html
rename to js/codemirror-5.39.0/demo/buffers.html
diff --git a/js/codemirror-5.23.0/demo/changemode.html b/js/codemirror-5.39.0/demo/changemode.html
similarity index 100%
rename from js/codemirror-5.23.0/demo/changemode.html
rename to js/codemirror-5.39.0/demo/changemode.html
diff --git a/js/codemirror-5.23.0/demo/closebrackets.html b/js/codemirror-5.39.0/demo/closebrackets.html
similarity index 100%
rename from js/codemirror-5.23.0/demo/closebrackets.html
rename to js/codemirror-5.39.0/demo/closebrackets.html
diff --git a/js/codemirror-5.23.0/demo/closetag.html b/js/codemirror-5.39.0/demo/closetag.html
similarity index 100%
rename from js/codemirror-5.23.0/demo/closetag.html
rename to js/codemirror-5.39.0/demo/closetag.html
diff --git a/js/codemirror-5.23.0/demo/complete.html b/js/codemirror-5.39.0/demo/complete.html
similarity index 99%
rename from js/codemirror-5.23.0/demo/complete.html
rename to js/codemirror-5.39.0/demo/complete.html
index 18e17c8..0464389 100644
--- a/js/codemirror-5.23.0/demo/complete.html
+++ b/js/codemirror-5.39.0/demo/complete.html
@@ -83,7 +83,7 @@
Autocomplete Demo
mode: {name: "javascript", globalVars: true}
});
-if (typeof Promise !== undefined) {
+if (typeof Promise !== "undefined") {
var comp = [
["here", "hither"],
["asynchronous", "nonsynchronous"],
diff --git a/js/codemirror-5.23.0/demo/emacs.html b/js/codemirror-5.39.0/demo/emacs.html
similarity index 100%
rename from js/codemirror-5.23.0/demo/emacs.html
rename to js/codemirror-5.39.0/demo/emacs.html
diff --git a/js/codemirror-5.23.0/demo/folding.html b/js/codemirror-5.39.0/demo/folding.html
similarity index 77%
rename from js/codemirror-5.23.0/demo/folding.html
rename to js/codemirror-5.39.0/demo/folding.html
index 81cbf98..1882b7c 100644
--- a/js/codemirror-5.23.0/demo/folding.html
+++ b/js/codemirror-5.39.0/demo/folding.html
@@ -5,6 +5,13 @@
+
+
@@ -12,10 +19,14 @@
+
+
+
+
+
CodeMirror
@@ -67,6 +70,10 @@
GFM mode
## A bit of GitHub spice
+See http://github.github.com/github-flavored-markdown/.
+
+(Set `gitHubSpice: false` in mode options to disable):
+
* SHA: be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2
* User@SHA ref: mojombo@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2
* User/Project@SHA: mojombo/god@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2
@@ -74,13 +81,21 @@
GFM mode
* User/#Num: mojombo#1
* User/Project#Num: mojombo/god#1
-See http://github.github.com/github-flavored-markdown/.
+(Set `emoji: false` in mode options to disable):
+
+* emoji: :smile:
+
-
You might want to use the Github-Flavored Markdown mode instead, which adds support for fenced code blocks and a few other things.
+
If you also want support strikethrough, emoji and few other goodies, check out Github-Flavored Markdown mode .
+
+
Optionally depends on other modes for properly highlighted code blocks,
+ and XML mode for properly highlighted inline XML blocks.
+
+
Markdown mode supports these options:
+
+
+
+ highlightFormatting: boolean
+ Whether to separately highlight markdown meta characterts (*[]()etc.) (default: false).
+
+
+
+
+ maxBlockquoteDepth: boolean
+ Maximum allowed blockquote nesting (default: 0 - infinite nesting).
+
+
+
+
+ xml: boolean
+ Whether to highlight inline XML (default: true).
+
+
+
+
+ fencedCodeBlockHighlighting: boolean
+ Whether to syntax-highlight fenced code blocks, if given mode is included (default: true).
+
+
+
+
+ tokenTypeOverrides: Object
+ When you want ot override default token type names (e.g. {code: "code"}).
+
+
+
+
+ allowAtxHeaderWithoutSpace: boolean
+ Allow lazy headers without whitespace between hashtag and text (default: false).
+
+
+
-
Optionally depends on the XML mode for properly highlighted inline XML blocks.
-
MIME types defined: text/x-markdown.
Parsing/Highlighting Tests: normal , verbose .
diff --git a/js/codemirror-5.23.0/mode/markdown/markdown.js b/js/codemirror-5.39.0/mode/markdown/markdown.js
similarity index 67%
rename from js/codemirror-5.23.0/mode/markdown/markdown.js
rename to js/codemirror-5.39.0/mode/markdown/markdown.js
index 1aeb344..d523ec8 100644
--- a/js/codemirror-5.23.0/mode/markdown/markdown.js
+++ b/js/codemirror-5.39.0/mode/markdown/markdown.js
@@ -35,15 +35,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
if (modeCfg.maxBlockquoteDepth === undefined)
modeCfg.maxBlockquoteDepth = 0;
- // Should underscores in words open/close em/strong?
- if (modeCfg.underscoresBreakWords === undefined)
- modeCfg.underscoresBreakWords = true;
-
- // Use `fencedCodeBlocks` to configure fenced code blocks. false to
- // disable, string to specify a precise regexp that the fence should
- // match, and true to allow three or more backticks or tildes (as
- // per CommonMark).
-
// Turn on task lists? ("- [ ] " and "- [x] ")
if (modeCfg.taskLists === undefined) modeCfg.taskLists = false;
@@ -51,6 +42,15 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
if (modeCfg.strikethrough === undefined)
modeCfg.strikethrough = false;
+ if (modeCfg.emoji === undefined)
+ modeCfg.emoji = false;
+
+ if (modeCfg.fencedCodeBlockHighlighting === undefined)
+ modeCfg.fencedCodeBlockHighlighting = true;
+
+ if (modeCfg.xml === undefined)
+ modeCfg.xml = true;
+
// Allow token types to be overridden by user-provided token types.
if (modeCfg.tokenTypeOverrides === undefined)
modeCfg.tokenTypeOverrides = {};
@@ -73,7 +73,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
linkHref: "string",
em: "em",
strong: "strong",
- strikethrough: "strikethrough"
+ strikethrough: "strikethrough",
+ emoji: "builtin"
};
for (var tokenType in tokenTypes) {
@@ -84,12 +85,14 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
var hrRE = /^([*\-_])(?:\s*\1){2,}\s*$/
, listRE = /^(?:[*\-+]|^[0-9]+([.)]))\s+/
- , taskListRE = /^\[(x| )\](?=\s)/ // Must follow listRE
+ , taskListRE = /^\[(x| )\](?=\s)/i // Must follow listRE
, atxHeaderRE = modeCfg.allowAtxHeaderWithoutSpace ? /^(#+)/ : /^(#+)(?: |$)/
, setextHeaderRE = /^ *(?:\={1,}|-{1,})\s*$/
- , textRE = /^[^#!\[\]*_\\<>` "'(~]+/
- , fencedCodeRE = new RegExp("^(" + (modeCfg.fencedCodeBlocks === true ? "~~~+|```+" : modeCfg.fencedCodeBlocks) +
- ")[ \\t]*([\\w+#\-]*)");
+ , textRE = /^[^#!\[\]*_\\<>` "'(~:]+/
+ , fencedCodeRE = /^(~~~+|```+)[ \t]*([\w+#-]*)[^\n`]*$/
+ , linkDefRE = /^\s*\[[^\]]+?\]:.*$/ // naive link-definition
+ , punctuation = /[!\"#$%&\'()*+,\-\.\/:;<=>?@\[\\\]^_`{|}~—]/
+ , expandedTab = " " // CommonMark specifies tab as 4 spaces
function switchInline(stream, state, f) {
state.f = state.inline = f;
@@ -110,6 +113,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
function blankLine(state) {
// Reset linkTitle state
state.linkTitle = false;
+ state.linkHref = false;
+ state.linkText = false;
// Reset EM state
state.em = false;
// Reset STRONG state
@@ -120,85 +125,104 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
state.quote = 0;
// Reset state.indentedCode
state.indentedCode = false;
- if (htmlModeMissing && state.f == htmlBlock) {
- state.f = inlineNormal;
- state.block = blockNormal;
+ if (state.f == htmlBlock) {
+ var exit = htmlModeMissing
+ if (!exit) {
+ var inner = CodeMirror.innerMode(htmlMode, state.htmlState)
+ exit = inner.mode.name == "xml" && inner.state.tagStart === null &&
+ (!inner.state.context && inner.state.tokenize.isInText)
+ }
+ if (exit) {
+ state.f = inlineNormal;
+ state.block = blockNormal;
+ state.htmlState = null;
+ }
}
// Reset state.trailingSpace
state.trailingSpace = 0;
state.trailingSpaceNewLine = false;
// Mark this line as blank
state.prevLine = state.thisLine
- state.thisLine = null
+ state.thisLine = {stream: null}
return null;
}
function blockNormal(stream, state) {
-
- var sol = stream.sol();
-
- var prevLineIsList = state.list !== false,
- prevLineIsIndentedCode = state.indentedCode;
+ var firstTokenOnLine = stream.column() === state.indentation;
+ var prevLineLineIsEmpty = lineIsEmpty(state.prevLine.stream);
+ var prevLineIsIndentedCode = state.indentedCode;
+ var prevLineIsHr = state.prevLine.hr;
+ var prevLineIsList = state.list !== false;
+ var maxNonCodeIndentation = (state.listStack[state.listStack.length - 1] || 0) + 3;
state.indentedCode = false;
- if (prevLineIsList) {
- if (state.indentationDiff >= 0) { // Continued list
- if (state.indentationDiff < 4) { // Only adjust indentation if *not* a code block
- state.indentation -= state.indentationDiff;
- }
- state.list = null;
- } else if (state.indentation > 0) {
+ var lineIndentation = state.indentation;
+ // compute once per line (on first token)
+ if (state.indentationDiff === null) {
+ state.indentationDiff = state.indentation;
+ if (prevLineIsList) {
+ // Reset inline styles which shouldn't propagate aross list items
+ state.em = false;
+ state.strong = false;
+ state.code = false;
+ state.strikethrough = false;
+
state.list = null;
- } else { // No longer a list
- state.list = false;
+ // While this list item's marker's indentation is less than the deepest
+ // list item's content's indentation,pop the deepest list item
+ // indentation off the stack, and update block indentation state
+ while (lineIndentation < state.listStack[state.listStack.length - 1]) {
+ state.listStack.pop();
+ if (state.listStack.length) {
+ state.indentation = state.listStack[state.listStack.length - 1];
+ // less than the first list's indent -> the line is no longer a list
+ } else {
+ state.list = false;
+ }
+ }
+ if (state.list !== false) {
+ state.indentationDiff = lineIndentation - state.listStack[state.listStack.length - 1]
+ }
}
}
+ // not comprehensive (currently only for setext detection purposes)
+ var allowsInlineContinuation = (
+ !prevLineLineIsEmpty && !prevLineIsHr && !state.prevLine.header &&
+ (!prevLineIsList || !prevLineIsIndentedCode) &&
+ !state.prevLine.fencedCodeEnd
+ );
+
+ var isHr = (state.list === false || prevLineIsHr || prevLineLineIsEmpty) &&
+ state.indentation <= maxNonCodeIndentation && stream.match(hrRE);
+
var match = null;
- if (state.indentationDiff >= 4) {
+ if (state.indentationDiff >= 4 && (prevLineIsIndentedCode || state.prevLine.fencedCodeEnd ||
+ state.prevLine.header || prevLineLineIsEmpty)) {
stream.skipToEnd();
- if (prevLineIsIndentedCode || lineIsEmpty(state.prevLine)) {
- state.indentation -= 4;
- state.indentedCode = true;
- return tokenTypes.code;
- } else {
- return null;
- }
+ state.indentedCode = true;
+ return tokenTypes.code;
} else if (stream.eatSpace()) {
return null;
- } else if ((match = stream.match(atxHeaderRE)) && match[1].length <= 6) {
+ } else if (firstTokenOnLine && state.indentation <= maxNonCodeIndentation && (match = stream.match(atxHeaderRE)) && match[1].length <= 6) {
+ state.quote = 0;
state.header = match[1].length;
+ state.thisLine.header = true;
if (modeCfg.highlightFormatting) state.formatting = "header";
state.f = state.inline;
return getType(state);
- } else if (!lineIsEmpty(state.prevLine) && !state.quote && !prevLineIsList &&
- !prevLineIsIndentedCode && (match = stream.match(setextHeaderRE))) {
- state.header = match[0].charAt(0) == '=' ? 1 : 2;
- if (modeCfg.highlightFormatting) state.formatting = "header";
- state.f = state.inline;
- return getType(state);
- } else if (stream.eat('>')) {
- state.quote = sol ? 1 : state.quote + 1;
+ } else if (state.indentation <= maxNonCodeIndentation && stream.eat('>')) {
+ state.quote = firstTokenOnLine ? 1 : state.quote + 1;
if (modeCfg.highlightFormatting) state.formatting = "quote";
stream.eatSpace();
return getType(state);
- } else if (stream.peek() === '[') {
- return switchInline(stream, state, footnoteLink);
- } else if (stream.match(hrRE, true)) {
- state.hr = true;
- return tokenTypes.hr;
- } else if (match = stream.match(listRE)) {
+ } else if (!isHr && !state.setext && firstTokenOnLine && state.indentation <= maxNonCodeIndentation && (match = stream.match(listRE))) {
var listType = match[1] ? "ol" : "ul";
- state.indentation = stream.column() + stream.current().length;
- state.list = true;
- // While this list item's marker's indentation
- // is less than the deepest list item's content's indentation,
- // pop the deepest list item indentation off the stack.
- while (state.listStack && stream.column() < state.listStack[state.listStack.length - 1]) {
- state.listStack.pop();
- }
+ state.indentation = lineIndentation + stream.current().length;
+ state.list = true;
+ state.quote = 0;
// Add this list item's content's indentation to the stack
state.listStack.push(state.indentation);
@@ -209,15 +233,47 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
state.f = state.inline;
if (modeCfg.highlightFormatting) state.formatting = ["list", "list-" + listType];
return getType(state);
- } else if (modeCfg.fencedCodeBlocks && (match = stream.match(fencedCodeRE, true))) {
- state.fencedChars = match[1]
+ } else if (firstTokenOnLine && state.indentation <= maxNonCodeIndentation && (match = stream.match(fencedCodeRE, true))) {
+ state.quote = 0;
+ state.fencedEndRE = new RegExp(match[1] + "+ *$");
// try switching mode
- state.localMode = getMode(match[2]);
+ state.localMode = modeCfg.fencedCodeBlockHighlighting && getMode(match[2]);
if (state.localMode) state.localState = CodeMirror.startState(state.localMode);
state.f = state.block = local;
if (modeCfg.highlightFormatting) state.formatting = "code-block";
state.code = -1
return getType(state);
+ // SETEXT has lowest block-scope precedence after HR, so check it after
+ // the others (code, blockquote, list...)
+ } else if (
+ // if setext set, indicates line after ---/===
+ state.setext || (
+ // line before ---/===
+ (!allowsInlineContinuation || !prevLineIsList) && !state.quote && state.list === false &&
+ !state.code && !isHr && !linkDefRE.test(stream.string) &&
+ (match = stream.lookAhead(1)) && (match = match.match(setextHeaderRE))
+ )
+ ) {
+ if ( !state.setext ) {
+ state.header = match[0].charAt(0) == '=' ? 1 : 2;
+ state.setext = state.header;
+ } else {
+ state.header = state.setext;
+ // has no effect on type so we can reset it now
+ state.setext = 0;
+ stream.skipToEnd();
+ if (modeCfg.highlightFormatting) state.formatting = "header";
+ }
+ state.thisLine.header = true;
+ state.f = state.inline;
+ return getType(state);
+ } else if (isHr) {
+ stream.skipToEnd();
+ state.hr = true;
+ state.thisLine.hr = true;
+ return tokenTypes.hr;
+ } else if (stream.peek() === '[') {
+ return switchInline(stream, state, footnoteLink);
}
return switchInline(stream, state, state.inline);
@@ -239,10 +295,21 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
}
function local(stream, state) {
- if (state.fencedChars && stream.match(state.fencedChars, false)) {
+ var currListInd = state.listStack[state.listStack.length - 1] || 0;
+ var hasExitedList = state.indentation < currListInd;
+ var maxFencedEndInd = currListInd + 3;
+ if (state.fencedEndRE && state.indentation <= maxFencedEndInd && (hasExitedList || stream.match(state.fencedEndRE))) {
+ if (modeCfg.highlightFormatting) state.formatting = "code-block";
+ var returnType;
+ if (!hasExitedList) returnType = getType(state)
state.localMode = state.localState = null;
- state.f = state.block = leavingLocal;
- return null;
+ state.block = blockNormal;
+ state.f = inlineNormal;
+ state.fencedEndRE = null;
+ state.code = 0
+ state.thisLine.fencedCodeEnd = true;
+ if (hasExitedList) return switchBlock(stream, state, state.block);
+ return returnType;
} else if (state.localMode) {
return state.localMode.token(stream, state.localState);
} else {
@@ -251,18 +318,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
}
}
- function leavingLocal(stream, state) {
- stream.match(state.fencedChars);
- state.block = blockNormal;
- state.f = inlineNormal;
- state.fencedChars = null;
- if (modeCfg.highlightFormatting) state.formatting = "code-block";
- state.code = 1
- var returnType = getType(state);
- state.code = 0
- return returnType;
- }
-
// Inline
function getType(state) {
var styles = [];
@@ -306,6 +361,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
if (state.strong) { styles.push(tokenTypes.strong); }
if (state.em) { styles.push(tokenTypes.em); }
if (state.strikethrough) { styles.push(tokenTypes.strikethrough); }
+ if (state.emoji) { styles.push(tokenTypes.emoji); }
if (state.linkText) { styles.push(tokenTypes.linkText); }
if (state.code) { styles.push(tokenTypes.code); }
if (state.image) { styles.push(tokenTypes.image); }
@@ -364,7 +420,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
}
if (state.taskList) {
- var taskOpen = stream.match(taskListRE, true)[1] !== "x";
+ var taskOpen = stream.match(taskListRE, true)[1] === " ";
if (taskOpen) state.taskOpen = true;
else state.taskClosed = true;
if (modeCfg.highlightFormatting) state.formatting = "task";
@@ -380,9 +436,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
return getType(state);
}
- // Get sol() value now, before character is consumed
- var sol = stream.sol();
-
var ch = stream.next();
// Matches link titles present on next line
@@ -392,7 +445,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
if (ch === '(') {
matchCh = ')';
}
- matchCh = (matchCh+'').replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1");
+ matchCh = (matchCh+'').replace(/([.?*+^\[\]\\(){}|-])/g, "\\$1");
var regex = '^\\s*(?:[^' + matchCh + '\\\\]+|\\\\\\\\|\\\\.)' + matchCh;
if (stream.match(new RegExp(regex), true)) {
return tokenTypes.linkHref;
@@ -405,7 +458,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
if (modeCfg.highlightFormatting) state.formatting = "code";
stream.eatWhile('`');
var count = stream.current().length
- if (state.code == 0) {
+ if (state.code == 0 && (!state.quote || count == 1)) {
state.code = count
return getType(state)
} else if (count == state.code) { // Must be exact
@@ -452,17 +505,18 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
return type;
}
- if (ch === '[' && stream.match(/[^\]]*\](\(.*\)| ?\[.*?\])/, false) && !state.image) {
+ if (ch === '[' && !state.image) {
+ if (state.linkText && stream.match(/^.*?\]/)) return getType(state)
state.linkText = true;
if (modeCfg.highlightFormatting) state.formatting = "link";
return getType(state);
}
- if (ch === ']' && state.linkText && stream.match(/\(.*?\)| ?\[.*?\]/, false)) {
+ if (ch === ']' && state.linkText) {
if (modeCfg.highlightFormatting) state.formatting = "link";
var type = getType(state);
state.linkText = false;
- state.inline = state.f = linkHref;
+ state.inline = state.f = stream.match(/\(.*?\)| ?\[.*?\]/, false) ? linkHref : inlineNormal
return type;
}
@@ -490,7 +544,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
return type + tokenTypes.linkEmail;
}
- if (ch === '<' && stream.match(/^(!--|[a-z]+(?:\s+[a-z_:.\-]+(?:\s*=\s*[^ >]+)?)*\s*>)/i, false)) {
+ if (modeCfg.xml && ch === '<' && stream.match(/^(!--|\?|!\[CDATA\[|[a-z][a-z0-9-]*(?:\s+[a-z_:.\-]+(?:\s*=\s*[^>]+)?)*\s*(?:>|$))/i, false)) {
var end = stream.string.indexOf(">", stream.pos);
if (end != -1) {
var atts = stream.string.substring(stream.start, end);
@@ -501,44 +555,37 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
return switchBlock(stream, state, htmlBlock);
}
- if (ch === '<' && stream.match(/^\/\w*?>/)) {
+ if (modeCfg.xml && ch === '<' && stream.match(/^\/\w*?>/)) {
state.md_inside = false;
return "tag";
- }
-
- var ignoreUnderscore = false;
- if (!modeCfg.underscoresBreakWords) {
- if (ch === '_' && stream.peek() !== '_' && stream.match(/(\w)/, false)) {
- var prevPos = stream.pos - 2;
- if (prevPos >= 0) {
- var prevCh = stream.string.charAt(prevPos);
- if (prevCh !== '_' && prevCh.match(/(\w)/, false)) {
- ignoreUnderscore = true;
- }
- }
+ } else if (ch === "*" || ch === "_") {
+ var len = 1, before = stream.pos == 1 ? " " : stream.string.charAt(stream.pos - 2)
+ while (len < 3 && stream.eat(ch)) len++
+ var after = stream.peek() || " "
+ // See http://spec.commonmark.org/0.27/#emphasis-and-strong-emphasis
+ var leftFlanking = !/\s/.test(after) && (!punctuation.test(after) || /\s/.test(before) || punctuation.test(before))
+ var rightFlanking = !/\s/.test(before) && (!punctuation.test(before) || /\s/.test(after) || punctuation.test(after))
+ var setEm = null, setStrong = null
+ if (len % 2) { // Em
+ if (!state.em && leftFlanking && (ch === "*" || !rightFlanking || punctuation.test(before)))
+ setEm = true
+ else if (state.em == ch && rightFlanking && (ch === "*" || !leftFlanking || punctuation.test(after)))
+ setEm = false
}
- }
- if (ch === '*' || (ch === '_' && !ignoreUnderscore)) {
- if (sol && stream.peek() === ' ') {
- // Do nothing, surrounded by newline and space
- } else if (state.strong === ch && stream.eat(ch)) { // Remove STRONG
- if (modeCfg.highlightFormatting) state.formatting = "strong";
- var t = getType(state);
- state.strong = false;
- return t;
- } else if (!state.strong && stream.eat(ch)) { // Add STRONG
- state.strong = ch;
- if (modeCfg.highlightFormatting) state.formatting = "strong";
- return getType(state);
- } else if (state.em === ch) { // Remove EM
- if (modeCfg.highlightFormatting) state.formatting = "em";
- var t = getType(state);
- state.em = false;
- return t;
- } else if (!state.em) { // Add EM
- state.em = ch;
- if (modeCfg.highlightFormatting) state.formatting = "em";
- return getType(state);
+ if (len > 1) { // Strong
+ if (!state.strong && leftFlanking && (ch === "*" || !rightFlanking || punctuation.test(before)))
+ setStrong = true
+ else if (state.strong == ch && rightFlanking && (ch === "*" || !leftFlanking || punctuation.test(after)))
+ setStrong = false
+ }
+ if (setStrong != null || setEm != null) {
+ if (modeCfg.highlightFormatting) state.formatting = setEm == null ? "strong" : setStrong == null ? "em" : "strong em"
+ if (setEm === true) state.em = ch
+ if (setStrong === true) state.strong = ch
+ var t = getType(state)
+ if (setEm === false) state.em = false
+ if (setStrong === false) state.strong = false
+ return t
}
} else if (ch === ' ') {
if (stream.eat('*') || stream.eat('_')) { // Probably surrounded by spaces
@@ -573,8 +620,16 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
}
}
+ if (modeCfg.emoji && ch === ":" && stream.match(/^[a-z_\d+-]+:/)) {
+ state.emoji = true;
+ if (modeCfg.highlightFormatting) state.formatting = "emoji";
+ var retType = getType(state);
+ state.emoji = false;
+ return retType;
+ }
+
if (ch === ' ') {
- if (stream.match(/ +$/, false)) {
+ if (stream.match(/^ +$/, false)) {
state.trailingSpace++;
} else if (state.trailingSpace) {
state.trailingSpaceNewLine = true;
@@ -611,7 +666,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
}
var ch = stream.next();
if (ch === '(' || ch === '[') {
- state.f = state.inline = getLinkHrefInside(ch === "(" ? ")" : "]", 0);
+ state.f = state.inline = getLinkHrefInside(ch === "(" ? ")" : "]");
if (modeCfg.highlightFormatting) state.formatting = "link-string";
state.linkHref = true;
return getType(state);
@@ -621,7 +676,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
var linkRE = {
")": /^(?:[^\\\(\)]|\\.|\((?:[^\\\(\)]|\\.)*\))*?(?=\))/,
- "]": /^(?:[^\\\[\]]|\\.|\[(?:[^\\\[\\]]|\\.)*\])*?(?=\])/
+ "]": /^(?:[^\\\[\]]|\\.|\[(?:[^\\\[\]]|\\.)*\])*?(?=\])/
}
function getLinkHrefInside(endChar) {
@@ -689,8 +744,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
return {
f: blockNormal,
- prevLine: null,
- thisLine: null,
+ prevLine: {stream: null},
+ thisLine: {stream: null},
block: blockNormal,
htmlState: null,
@@ -707,6 +762,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
em: false,
strong: false,
header: 0,
+ setext: 0,
hr: false,
taskList: false,
list: false,
@@ -715,7 +771,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
trailingSpace: 0,
trailingSpaceNewLine: false,
strikethrough: false,
- fencedChars: null
+ emoji: false,
+ fencedEndRE: null
};
},
@@ -736,12 +793,16 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
inline: s.inline,
text: s.text,
formatting: false,
+ linkText: s.linkText,
linkTitle: s.linkTitle,
+ linkHref: s.linkHref,
code: s.code,
em: s.em,
strong: s.strong,
strikethrough: s.strikethrough,
+ emoji: s.emoji,
header: s.header,
+ setext: s.setext,
hr: s.hr,
taskList: s.taskList,
list: s.list,
@@ -751,7 +812,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
trailingSpace: s.trailingSpace,
trailingSpaceNewLine: s.trailingSpaceNewLine,
md_inside: s.md_inside,
- fencedChars: s.fencedChars
+ fencedEndRE: s.fencedEndRE
};
},
@@ -760,21 +821,17 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
// Reset state.formatting
state.formatting = false;
- if (stream != state.thisLine) {
- var forceBlankLine = state.header || state.hr;
-
- // Reset state.header and state.hr
+ if (stream != state.thisLine.stream) {
state.header = 0;
state.hr = false;
- if (stream.match(/^\s*$/, true) || forceBlankLine) {
+ if (stream.match(/^\s*$/, true)) {
blankLine(state);
- if (!forceBlankLine) return null
- state.prevLine = null
+ return null;
}
state.prevLine = state.thisLine
- state.thisLine = stream
+ state.thisLine = {stream: stream}
// Reset state.taskList
state.taskList = false;
@@ -783,11 +840,15 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
state.trailingSpace = 0;
state.trailingSpaceNewLine = false;
- state.f = state.block;
- var indentation = stream.match(/^\s*/, true)[0].replace(/\t/g, ' ').length;
- state.indentationDiff = Math.min(indentation - state.indentation, 4);
- state.indentation = state.indentation + state.indentationDiff;
- if (indentation > 0) return null;
+ if (!state.localState) {
+ state.f = state.block;
+ if (state.f != htmlBlock) {
+ var indentation = stream.match(/^\s*/, true)[0].replace(/\t/g, expandedTab).length;
+ state.indentation = indentation;
+ state.indentationDiff = null;
+ if (indentation > 0) return null;
+ }
+ }
}
return state.f(stream, state);
},
@@ -798,6 +859,12 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
return {state: state, mode: mode};
},
+ indent: function(state, textAfter, line) {
+ if (state.block == htmlBlock && htmlMode.indent) return htmlMode.indent(state.htmlState, textAfter, line)
+ if (state.localState && state.localMode.indent) return state.localMode.indent(state.localState, textAfter, line)
+ return CodeMirror.Pass
+ },
+
blankLine: blankLine,
getType: getType,
@@ -808,6 +875,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
return mode;
}, "xml");
+CodeMirror.defineMIME("text/markdown", "markdown");
+
CodeMirror.defineMIME("text/x-markdown", "markdown");
});
diff --git a/js/codemirror-5.23.0/mode/markdown/test.js b/js/codemirror-5.39.0/mode/markdown/test.js
similarity index 71%
rename from js/codemirror-5.23.0/mode/markdown/test.js
rename to js/codemirror-5.39.0/mode/markdown/test.js
index 37ecb4b..a6da158 100644
--- a/js/codemirror-5.23.0/mode/markdown/test.js
+++ b/js/codemirror-5.39.0/mode/markdown/test.js
@@ -2,17 +2,21 @@
// Distributed under an MIT license: http://codemirror.net/LICENSE
(function() {
- var mode = CodeMirror.getMode({tabSize: 4}, "markdown");
+ var config = {tabSize: 4, indentUnit: 2}
+ var mode = CodeMirror.getMode(config, "markdown");
function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
- var modeHighlightFormatting = CodeMirror.getMode({tabSize: 4}, {name: "markdown", highlightFormatting: true});
+ var modeHighlightFormatting = CodeMirror.getMode(config, {name: "markdown", highlightFormatting: true});
function FT(name) { test.mode(name, modeHighlightFormatting, Array.prototype.slice.call(arguments, 1)); }
- var modeAtxNoSpace = CodeMirror.getMode({tabSize: 4}, {name: "markdown", allowAtxHeaderWithoutSpace: true});
+ var modeMT_noXml = CodeMirror.getMode(config, {name: "markdown", xml: false});
+ function MT_noXml(name) { test.mode(name, modeMT_noXml, Array.prototype.slice.call(arguments, 1)); }
+ var modeMT_noFencedHighlight = CodeMirror.getMode(config, {name: "markdown", fencedCodeBlockHighlighting: false});
+ function MT_noFencedHighlight(name) { test.mode(name, modeMT_noFencedHighlight, Array.prototype.slice.call(arguments, 1)); }
+ var modeAtxNoSpace = CodeMirror.getMode(config, {name: "markdown", allowAtxHeaderWithoutSpace: true});
function AtxNoSpaceTest(name) { test.mode(name, modeAtxNoSpace, Array.prototype.slice.call(arguments, 1)); }
- var modeFenced = CodeMirror.getMode({tabSize: 4}, {name: "markdown", fencedCodeBlocks: true});
- function FencedTest(name) { test.mode(name, modeFenced, Array.prototype.slice.call(arguments, 1)); }
- var modeOverrideClasses = CodeMirror.getMode({tabsize: 4}, {
+ var modeOverrideClasses = CodeMirror.getMode(config, {
name: "markdown",
strikethrough: true,
+ emoji: true,
tokenTypeOverrides: {
"header" : "override-header",
"code" : "override-code",
@@ -30,10 +34,11 @@
"linkHref" : "override-link-href",
"em" : "override-em",
"strong" : "override-strong",
- "strikethrough" : "override-strikethrough"
+ "strikethrough" : "override-strikethrough",
+ "emoji" : "override-emoji"
}});
function TokenTypeOverrideTest(name) { test.mode(name, modeOverrideClasses, Array.prototype.slice.call(arguments, 1)); }
- var modeFormattingOverride = CodeMirror.getMode({tabsize: 4}, {
+ var modeFormattingOverride = CodeMirror.getMode(config, {
name: "markdown",
highlightFormatting: true,
tokenTypeOverrides: {
@@ -64,7 +69,7 @@
"[header&header-1&formatting&formatting-header&formatting-header-1 # ][header&header-1 foo # bar ][header&header-1&formatting&formatting-header&formatting-header-1 #]");
FT("formatting_setextHeader",
- "foo",
+ "[header&header-1 foo]",
"[header&header-1&formatting&formatting-header&formatting-header-1 =]");
FT("formatting_blockquote",
@@ -94,6 +99,11 @@
FT("formatting_image",
"[formatting&formatting-image&image&image-marker !][formatting&formatting-image&image&image-alt-text&link [[][image&image-alt-text&link alt text][formatting&formatting-image&image&image-alt-text&link ]]][formatting&formatting-link-string&string&url (][url&string http://link.to/image.jpg][formatting&formatting-link-string&string&url )]");
+ FT("codeBlock",
+ "[comment&formatting&formatting-code-block ```css]",
+ "[tag foo]",
+ "[comment&formatting&formatting-code-block ```]");
+
MT("plainText",
"foo");
@@ -141,6 +151,21 @@
"Foo",
" Bar");
+ MT("codeBlocksAfterATX",
+ "[header&header-1 # foo]",
+ " [comment code]");
+
+ MT("codeBlocksAfterSetext",
+ "[header&header-2 foo]",
+ "[header&header-2 ---]",
+ " [comment code]");
+
+ MT("codeBlocksAfterFencedCode",
+ "[comment ```]",
+ "[comment foo]",
+ "[comment ```]",
+ " [comment code]");
+
// Inline code using backticks
MT("inlineCodeUsingBackticks",
"foo [comment `bar`]");
@@ -182,6 +207,10 @@
MT("closedBackticks",
"[comment ``foo ``` bar` hello``] world");
+ // info string cannot contain backtick, thus should result in inline code
+ MT("closingFencedMarksOnSameLine",
+ "[comment ``` code ```] foo");
+
// atx headers
// http://daringfireball.net/projects/markdown/syntax#header
@@ -225,6 +254,19 @@
MT("atxH1inline",
"[header&header-1 # foo ][header&header-1&em *bar*]");
+ MT("atxIndentedTooMuch",
+ "[header&header-1 # foo]",
+ " [comment # bar]");
+
+ // disable atx inside blockquote until we implement proper blockquote inner mode
+ // TODO: fix to be CommonMark-compliant
+ MT("atxNestedInsideBlockquote",
+ "[quote"e-1 > # foo]");
+
+ MT("atxAfterBlockquote",
+ "[quote"e-1 > foo]",
+ "[header&header-1 # bar]");
+
// Setext headers - H1, H2
// Per documentation, "Any number of underlining =’s or -’s will work."
// http://daringfireball.net/projects/markdown/syntax#header
@@ -234,27 +276,27 @@
//
// Check if single underlining = works
MT("setextH1",
- "foo",
+ "[header&header-1 foo]",
"[header&header-1 =]");
// Check if 3+ ='s work
MT("setextH1",
- "foo",
+ "[header&header-1 foo]",
"[header&header-1 ===]");
// Check if single underlining - works
MT("setextH2",
- "foo",
+ "[header&header-2 foo]",
"[header&header-2 -]");
// Check if 3+ -'s work
MT("setextH2",
- "foo",
+ "[header&header-2 foo]",
"[header&header-2 ---]");
// http://spec.commonmark.org/0.19/#example-45
MT("setextH2AllowSpaces",
- "foo",
+ "[header&header-2 foo]",
" [header&header-2 ---- ]");
// http://spec.commonmark.org/0.19/#example-44
@@ -262,15 +304,86 @@
" [comment foo]",
"[hr ---]");
+ MT("setextAfterFencedCode",
+ "[comment ```]",
+ "[comment foo]",
+ "[comment ```]",
+ "[header&header-2 bar]",
+ "[header&header-2 ---]");
+
+ MT("setextAferATX",
+ "[header&header-1 # foo]",
+ "[header&header-2 bar]",
+ "[header&header-2 ---]");
+
// http://spec.commonmark.org/0.19/#example-51
MT("noSetextAfterQuote",
"[quote"e-1 > foo]",
+ "[hr ---]",
+ "",
+ "[quote"e-1 > foo]",
+ "[quote"e-1 bar]",
"[hr ---]");
MT("noSetextAfterList",
"[variable-2 - foo]",
"[hr ---]");
+ MT("noSetextAfterList_listContinuation",
+ "[variable-2 - foo]",
+ "bar",
+ "[hr ---]");
+
+ MT("setextAfterList_afterIndentedCode",
+ "[variable-2 - foo]",
+ "",
+ " [comment bar]",
+ "[header&header-2 baz]",
+ "[header&header-2 ---]");
+
+ MT("setextAfterList_afterFencedCodeBlocks",
+ "[variable-2 - foo]",
+ "",
+ " [comment ```]",
+ " [comment bar]",
+ " [comment ```]",
+ "[header&header-2 baz]",
+ "[header&header-2 ---]");
+
+ MT("setextAfterList_afterHeader",
+ "[variable-2 - foo]",
+ " [variable-2&header&header-1 # bar]",
+ "[header&header-2 baz]",
+ "[header&header-2 ---]");
+
+ MT("setextAfterList_afterHr",
+ "[variable-2 - foo]",
+ "",
+ " [hr ---]",
+ "[header&header-2 bar]",
+ "[header&header-2 ---]");
+
+ MT("setext_nestedInlineMarkup",
+ "[header&header-1 foo ][em&header&header-1 *bar*]",
+ "[header&header-1 =]");
+
+ MT("setext_linkDef",
+ "[link [[aaa]]:] [string&url http://google.com 'title']",
+ "[hr ---]");
+
+ // currently, looks max one line ahead, thus won't catch valid CommonMark
+ // markup
+ MT("setext_oneLineLookahead",
+ "foo",
+ "[header&header-1 bar]",
+ "[header&header-1 =]");
+
+ // ensure we don't regard space after dash as a list
+ MT("setext_emptyList",
+ "[header&header-2 foo]",
+ "[header&header-2 - ]",
+ "foo");
+
// Single-line blockquote with trailing space
MT("blockquoteSpace",
"[quote"e-1 > foo]");
@@ -284,12 +397,22 @@
"foo",
"[quote"e-1 > bar]");
- // Nested blockquote
- MT("blockquoteSpace",
+ MT("blockquoteNested",
"[quote"e-1 > foo]",
"[quote"e-1 >][quote"e-2 > foo]",
"[quote"e-1 >][quote"e-2 >][quote"e-3 > foo]");
+ // ensure quote-level is inferred correctly even if indented
+ MT("blockquoteNestedIndented",
+ " [quote"e-1 > foo]",
+ " [quote"e-1 >][quote"e-2 > foo]",
+ " [quote"e-1 >][quote"e-2 >][quote"e-3 > foo]");
+
+ // ensure quote-level is inferred correctly even if indented
+ MT("blockquoteIndentedTooMuch",
+ "foo",
+ " > bar");
+
// Single-line blockquote followed by normal paragraph
MT("blockquoteThenParagraph",
"[quote"e-1 >foo]",
@@ -320,6 +443,20 @@
"",
"hello");
+ // disallow lists inside blockquote for now because it causes problems outside blockquote
+ // TODO: fix to be CommonMark-compliant
+ MT("listNestedInBlockquote",
+ "[quote"e-1 > - foo]");
+
+ // disallow fenced blocks inside blockquote because it causes problems outside blockquote
+ // TODO: fix to be CommonMark-compliant
+ MT("fencedBlockNestedInBlockquote",
+ "[quote"e-1 > ```]",
+ "[quote"e-1 > code]",
+ "[quote"e-1 > ```]",
+ // ensure we still allow inline code
+ "[quote"e-1 > ][quote"e-1&comment `code`]");
+
// Header with leading space after continued blockquote (#3287, negative indentation)
MT("headerAfterContinuedBlockquote",
"[quote"e-1 > foo]",
@@ -377,32 +514,53 @@
"[variable-2 - foo]",
"[hr -----]");
+ MT("hrAfterFencedCode",
+ "[comment ```]",
+ "[comment code]",
+ "[comment ```]",
+ "[hr ---]");
+
+ // allow hr inside lists
+ // (require prev line to be empty or hr, TODO: non-CommonMark-compliant)
+ MT("hrInsideList",
+ "[variable-2 - foo]",
+ "",
+ " [hr ---]",
+ " [hr ---]",
+ "",
+ " [comment ---]");
+
+ MT("consecutiveHr",
+ "[hr ---]",
+ "[hr ---]",
+ "[hr ---]");
+
// Formatting in lists (*)
MT("listAsteriskFormatting",
"[variable-2 * ][variable-2&em *foo*][variable-2 bar]",
"[variable-2 * ][variable-2&strong **foo**][variable-2 bar]",
- "[variable-2 * ][variable-2&strong **][variable-2&em&strong *foo**][variable-2&em *][variable-2 bar]",
+ "[variable-2 * ][variable-2&em&strong ***foo***][variable-2 bar]",
"[variable-2 * ][variable-2&comment `foo`][variable-2 bar]");
// Formatting in lists (+)
MT("listPlusFormatting",
"[variable-2 + ][variable-2&em *foo*][variable-2 bar]",
"[variable-2 + ][variable-2&strong **foo**][variable-2 bar]",
- "[variable-2 + ][variable-2&strong **][variable-2&em&strong *foo**][variable-2&em *][variable-2 bar]",
+ "[variable-2 + ][variable-2&em&strong ***foo***][variable-2 bar]",
"[variable-2 + ][variable-2&comment `foo`][variable-2 bar]");
// Formatting in lists (-)
MT("listDashFormatting",
"[variable-2 - ][variable-2&em *foo*][variable-2 bar]",
"[variable-2 - ][variable-2&strong **foo**][variable-2 bar]",
- "[variable-2 - ][variable-2&strong **][variable-2&em&strong *foo**][variable-2&em *][variable-2 bar]",
+ "[variable-2 - ][variable-2&em&strong ***foo***][variable-2 bar]",
"[variable-2 - ][variable-2&comment `foo`][variable-2 bar]");
// Formatting in lists (1.)
MT("listNumberFormatting",
"[variable-2 1. ][variable-2&em *foo*][variable-2 bar]",
"[variable-2 2. ][variable-2&strong **foo**][variable-2 bar]",
- "[variable-2 3. ][variable-2&strong **][variable-2&em&strong *foo**][variable-2&em *][variable-2 bar]",
+ "[variable-2 3. ][variable-2&em&strong ***foo***][variable-2 bar]",
"[variable-2 4. ][variable-2&comment `foo`][variable-2 bar]");
// Paragraph lists
@@ -468,6 +626,66 @@
" [variable-3 * Otherwise, it will be part of the level where it does meet this.]",
" [variable-2 * World]");
+ // should handle nested and un-nested lists
+ MT("listCommonMark_MixedIndents",
+ "[variable-2 * list1]",
+ " [variable-2 list1]",
+ " [variable-2&header&header-1 # heading still part of list1]",
+ " [variable-2 text after heading still part of list1]",
+ "",
+ " [comment indented codeblock]",
+ " [variable-2 list1 after code block]",
+ " [variable-3 * list2]",
+ // amount of spaces on empty lines between lists doesn't matter
+ " ",
+ // extra empty lines irrelevant
+ "",
+ "",
+ " [variable-3 indented text part of list2]",
+ " [keyword * list3]",
+ "",
+ " [variable-3 text at level of list2]",
+ "",
+ " [variable-2 de-indented text part of list1 again]",
+ "",
+ " [variable-2&comment ```]",
+ " [comment code]",
+ " [variable-2&comment ```]",
+ "",
+ " [variable-2 text after fenced code]");
+
+ // should correctly parse numbered list content indentation
+ MT("listCommonMark_NumeberedListIndent",
+ "[variable-2 1000. list with base indent of 6]",
+ "",
+ " [variable-2 text must be indented 6 spaces at minimum]",
+ "",
+ " [variable-2 9-spaces indented text still part of list]",
+ "",
+ " [comment indented codeblock starts at 10 spaces]",
+ "",
+ " [comment text indented by 5 spaces no longer belong to list]");
+
+ // should consider tab as 4 spaces
+ MT("listCommonMark_TabIndented",
+ "[variable-2 * list]",
+ "\t[variable-3 * list2]",
+ "",
+ "\t\t[variable-3 part of list2]");
+
+ MT("listAfterBlockquote",
+ "[quote"e-1 > foo]",
+ "[variable-2 - bar]");
+
+ // shouldn't create sublist if it's indented more than allowed
+ MT("nestedListIndentedTooMuch",
+ "[variable-2 - foo]",
+ " [variable-2 - bar]");
+
+ MT("listIndentedTooMuchAfterParagraph",
+ "foo",
+ " - bar");
+
// Blockquote
MT("blockquote",
"[variable-2 * foo]",
@@ -605,7 +823,7 @@
"[image&image-marker !][image&image-alt-text&link [[][image-alt-text&strong&image&link **alt text**][image&image-alt-text&link ]]][string&url (http://link.to/image.jpg)]");
MT("imageEmStrong",
- "[image&image-marker !][image&image-alt-text&link [[][image-alt-text&image&strong&link **][image&image-alt-text&em&strong&link *alt text**][image&image-alt-text&em&link *][image&image-alt-text&link ]]][string&url (http://link.to/image.jpg)]");
+ "[image&image-marker !][image&image-alt-text&link [[][image&image-alt-text&em&strong&link ***alt text***][image&image-alt-text&link ]]][string&url (http://link.to/image.jpg)]");
// Inline link with title
MT("linkTitle",
@@ -629,7 +847,12 @@
// Inline link with EmStrong
MT("linkEmStrong",
- "[link [[][link&strong **][link&em&strong *foo**][link&em *][link ]]][string&url (http://example.com/)] bar");
+ "[link [[][link&em&strong ***foo***][link ]]][string&url (http://example.com/)] bar");
+
+ MT("multilineLink",
+ "[link [[foo]",
+ "[link bar]]][string&url (https://foo#_a)]",
+ "should not be italics")
// Image with title
MT("imageTitle",
@@ -647,7 +870,7 @@
// regularly in text, especially in quoted material, and no space is allowed
// between square brackets and parentheses (per Dingus).
MT("notALink",
- "[[foo]] (bar)");
+ "[link [[foo]]] (bar)");
// Reference-style links
MT("linkReference",
@@ -663,7 +886,7 @@
// Reference-style links with EmStrong
MT("linkReferenceEmStrong",
- "[link [[][link&strong **][link&em&strong *foo**][link&em *][link ]]][string&url [[bar]]] hello");
+ "[link [[][link&em&strong ***foo***][link ]]][string&url [[bar]]] hello");
// Reference-style links with optional space separator (per documentation)
// "You can optionally use a space to separate the sets of brackets"
@@ -672,7 +895,7 @@
// Should only allow a single space ("...use *a* space...")
MT("linkReferenceDoubleSpace",
- "[[foo]] [[bar]] hello");
+ "[link [[foo]]] [link [[bar]]] hello");
// Reference-style links with implicit link name
MT("linkImplicit",
@@ -733,7 +956,7 @@
"[link [[foo \\]]: bar]]:] [string&url http://example.com/]");
MT("labelEscapeEnd",
- "[[foo\\]]: http://example.com/");
+ "\\[[foo\\]]: http://example.com/");
MT("linkWeb",
"[link
] foo");
@@ -757,7 +980,7 @@
"foo[em *bar*]hello");
MT("emInWordUnderscore",
- "foo[em _bar_]hello");
+ "foo_bar_hello");
// Per documentation: "...surround an * or _ with spaces, it’ll be
// treated as a literal asterisk or underscore."
@@ -766,11 +989,11 @@
"foo [em _bar _ hello_] world");
MT("emEscapedBySpaceOut",
- "foo _ bar[em _hello_]world");
+ "foo _ bar [em _hello_] world");
MT("emEscapedByNewline",
"foo",
- "_ bar[em _hello_]world");
+ "_ bar [em _hello_] world");
// Unclosed emphasis characters
// Instead of simply marking as EM / STRONG, it would be nice to have an
@@ -791,14 +1014,14 @@
"[em *foo][em&strong **bar*][strong hello**] world");
MT("emStrongUnderscore",
- "[em _foo][em&strong __bar_][strong hello__] world");
+ "[em _foo ][em&strong __bar_][strong hello__] world");
// "...same character must be used to open and close an emphasis span.""
MT("emStrongMixed",
"[em _foo][em&strong **bar*hello__ world]");
MT("emStrongMixed",
- "[em *foo][em&strong __bar_hello** world]");
+ "[em *foo ][em&strong __bar_hello** world]");
MT("linkWithNestedParens",
"[link [[foo]]][string&url (bar(baz))]")
@@ -913,26 +1136,77 @@
TokenTypeOverrideTest("overrideStrikethrough",
"[override-strikethrough ~~foo~~]");
+ TokenTypeOverrideTest("overrideEmoji",
+ "[override-emoji :foo:]");
+
FormatTokenTypeOverrideTest("overrideFormatting",
"[override-formatting-escape \\*]");
// Tests to make sure GFM-specific things aren't getting through
MT("taskList",
- "[variable-2 * [ ]] bar]");
+ "[variable-2 * ][link&variable-2 [[ ]]][variable-2 bar]");
- MT("noFencedCodeBlocks",
- "~~~",
- "foo",
- "~~~");
+ MT("fencedCodeBlocks",
+ "[comment ```]",
+ "[comment foo]",
+ "",
+ "[comment bar]",
+ "[comment ```]",
+ "baz");
+
+ MT("fencedCodeBlocks_invalidClosingFence_trailingText",
+ "[comment ```]",
+ "[comment foo]",
+ "[comment ``` must not have trailing text]",
+ "[comment baz]");
+
+ MT("fencedCodeBlocks_invalidClosingFence_trailingTabs",
+ "[comment ```]",
+ "[comment foo]",
+ "[comment ```\t]",
+ "[comment baz]");
+
+ MT("fencedCodeBlocks_validClosingFence",
+ "[comment ```]",
+ "[comment foo]",
+ // may have trailing spaces
+ "[comment ``` ]",
+ "baz");
+
+ MT("fencedCodeBlocksInList_closingFenceIndented",
+ "[variable-2 - list]",
+ " [variable-2&comment ```]",
+ " [comment foo]",
+ " [variable-2&comment ```]",
+ " [variable-2 baz]");
+
+ MT("fencedCodeBlocksInList_closingFenceIndentedTooMuch",
+ "[variable-2 - list]",
+ " [variable-2&comment ```]",
+ " [comment foo]",
+ " [comment ```]",
+ " [comment baz]");
- FencedTest("fencedCodeBlocks",
+ MT("fencedCodeBlockModeSwitching",
+ "[comment ```javascript]",
+ "[variable foo]",
+ "",
"[comment ```]",
+ "bar");
+
+ MT_noFencedHighlight("fencedCodeBlock_noHighlight",
+ "[comment ```javascript]",
"[comment foo]",
+ "[comment ```]");
+
+ MT("fencedCodeBlockModeSwitchingObjc",
+ "[comment ```objective-c]",
+ "[keyword @property] [variable NSString] [operator *] [variable foo];",
"[comment ```]",
"bar");
- FencedTest("fencedCodeBlocksMultipleChars",
+ MT("fencedCodeBlocksMultipleChars",
"[comment `````]",
"[comment foo]",
"[comment ```]",
@@ -940,20 +1214,20 @@
"[comment `````]",
"bar");
- FencedTest("fencedCodeBlocksTildes",
+ MT("fencedCodeBlocksTildes",
"[comment ~~~]",
"[comment foo]",
"[comment ~~~]",
"bar");
- FencedTest("fencedCodeBlocksTildesMultipleChars",
+ MT("fencedCodeBlocksTildesMultipleChars",
"[comment ~~~~~]",
"[comment ~~~]",
"[comment foo]",
"[comment ~~~~~]",
"bar");
- FencedTest("fencedCodeBlocksMultipleChars",
+ MT("fencedCodeBlocksMultipleChars",
"[comment `````]",
"[comment foo]",
"[comment ```]",
@@ -961,19 +1235,42 @@
"[comment `````]",
"bar");
- FencedTest("fencedCodeBlocksMixed",
+ MT("fencedCodeBlocksMixed",
"[comment ~~~]",
"[comment ```]",
"[comment foo]",
"[comment ~~~]",
"bar");
+ MT("fencedCodeBlocksAfterBlockquote",
+ "[quote"e-1 > foo]",
+ "[comment ```]",
+ "[comment bar]",
+ "[comment ```]");
+
+ // fencedCode indented too much should act as simple indentedCode
+ // (hence has no highlight formatting)
+ FT("tooMuchIndentedFencedCode",
+ " [comment ```]",
+ " [comment code]",
+ " [comment ```]");
+
+ MT("autoTerminateFencedCodeWhenLeavingList",
+ "[variable-2 - list1]",
+ " [variable-3 - list2]",
+ " [variable-3&comment ```]",
+ " [comment code]",
+ " [variable-3 - list2]",
+ " [variable-2&comment ```]",
+ " [comment code]",
+ "[quote"e-1 > foo]");
+
// Tests that require XML mode
MT("xmlMode",
"[tag&bracket <][tag div][tag&bracket >]",
- "*foo*",
- "[tag&bracket <][tag http://github.com][tag&bracket />]",
+ " *foo*",
+ " [tag&bracket <][tag http://github.com][tag&bracket />]",
"[tag&bracket ][tag div][tag&bracket >]",
"[link
]");
@@ -986,4 +1283,26 @@
"[tag&bracket <][tag div][tag&bracket >]",
"[tag&bracket ][tag div][tag&bracket >]");
+ MT("xmlModeLineBreakInTags",
+ "[tag&bracket <][tag div] [attribute id]=[string \"1\"]",
+ " [attribute class]=[string \"sth\"][tag&bracket >]xxx",
+ "[tag&bracket ][tag div][tag&bracket >]");
+
+ MT("xmlModeCommentWithBlankLine",
+ "[comment ]");
+
+ MT("xmlModeCDATA",
+ "[atom ]");
+
+ MT("xmlModePreprocessor",
+ "[meta ]");
+
+ MT_noXml("xmlHighlightDisabled",
+ "
foo
");
+
})();
diff --git a/js/codemirror-5.23.0/mode/mathematica/index.html b/js/codemirror-5.39.0/mode/mathematica/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/mathematica/index.html
rename to js/codemirror-5.39.0/mode/mathematica/index.html
diff --git a/js/codemirror-5.23.0/mode/mathematica/mathematica.js b/js/codemirror-5.39.0/mode/mathematica/mathematica.js
similarity index 96%
rename from js/codemirror-5.23.0/mode/mathematica/mathematica.js
rename to js/codemirror-5.39.0/mode/mathematica/mathematica.js
index d697708..07e808b 100644
--- a/js/codemirror-5.23.0/mode/mathematica/mathematica.js
+++ b/js/codemirror-5.39.0/mode/mathematica/mathematica.js
@@ -71,12 +71,12 @@ CodeMirror.defineMode('mathematica', function(_config, _parserConfig) {
}
// usage
- if (stream.match(/([a-zA-Z\$]+(?:`?[a-zA-Z0-9\$])*::usage)/, true, false)) {
+ if (stream.match(/([a-zA-Z\$][a-zA-Z0-9\$]*(?:`[a-zA-Z0-9\$]+)*::usage)/, true, false)) {
return 'meta';
}
// message
- if (stream.match(/([a-zA-Z\$]+(?:`?[a-zA-Z0-9\$])*::[a-zA-Z\$][a-zA-Z0-9\$]*):?/, true, false)) {
+ if (stream.match(/([a-zA-Z\$][a-zA-Z0-9\$]*(?:`[a-zA-Z0-9\$]+)*::[a-zA-Z\$][a-zA-Z0-9\$]*):?/, true, false)) {
return 'string-2';
}
diff --git a/js/codemirror-5.23.0/mode/mbox/index.html b/js/codemirror-5.39.0/mode/mbox/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/mbox/index.html
rename to js/codemirror-5.39.0/mode/mbox/index.html
diff --git a/js/codemirror-5.23.0/mode/mbox/mbox.js b/js/codemirror-5.39.0/mode/mbox/mbox.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/mbox/mbox.js
rename to js/codemirror-5.39.0/mode/mbox/mbox.js
diff --git a/js/codemirror-5.23.0/mode/meta.js b/js/codemirror-5.39.0/mode/meta.js
similarity index 91%
rename from js/codemirror-5.23.0/mode/meta.js
rename to js/codemirror-5.39.0/mode/meta.js
index bb60502..615b6a5 100644
--- a/js/codemirror-5.23.0/mode/meta.js
+++ b/js/codemirror-5.39.0/mode/meta.js
@@ -13,11 +13,11 @@
CodeMirror.modeInfo = [
{name: "APL", mime: "text/apl", mode: "apl", ext: ["dyalog", "apl"]},
- {name: "PGP", mimes: ["application/pgp", "application/pgp-keys", "application/pgp-signature"], mode: "asciiarmor", ext: ["pgp"]},
+ {name: "PGP", mimes: ["application/pgp", "application/pgp-encrypted", "application/pgp-keys", "application/pgp-signature"], mode: "asciiarmor", ext: ["asc", "pgp", "sig"]},
{name: "ASN.1", mime: "text/x-ttcn-asn", mode: "asn.1", ext: ["asn", "asn1"]},
{name: "Asterisk", mime: "text/x-asterisk", mode: "asterisk", file: /^extensions\.conf$/i},
{name: "Brainfuck", mime: "text/x-brainfuck", mode: "brainfuck", ext: ["b", "bf"]},
- {name: "C", mime: "text/x-csrc", mode: "clike", ext: ["c", "h"]},
+ {name: "C", mime: "text/x-csrc", mode: "clike", ext: ["c", "h", "ino"]},
{name: "C++", mime: "text/x-c++src", mode: "clike", ext: ["cpp", "c++", "cc", "cxx", "hpp", "h++", "hh", "hxx"], alias: ["cpp"]},
{name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ["cob", "cpy"]},
{name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"], alias: ["csharp"]},
@@ -25,7 +25,7 @@
{name: "ClojureScript", mime: "text/x-clojurescript", mode: "clojure", ext: ["cljs"]},
{name: "Closure Stylesheets (GSS)", mime: "text/x-gss", mode: "css", ext: ["gss"]},
{name: "CMake", mime: "text/x-cmake", mode: "cmake", ext: ["cmake", "cmake.in"], file: /^CMakeLists.txt$/},
- {name: "CoffeeScript", mime: "text/x-coffeescript", mode: "coffeescript", ext: ["coffee"], alias: ["coffee", "coffee-script"]},
+ {name: "CoffeeScript", mimes: ["application/vnd.coffeescript", "text/coffeescript", "text/x-coffeescript"], mode: "coffeescript", ext: ["coffee"], alias: ["coffee", "coffee-script"]},
{name: "Common Lisp", mime: "text/x-common-lisp", mode: "commonlisp", ext: ["cl", "lisp", "el"], alias: ["lisp"]},
{name: "Cypher", mime: "application/x-cypher-query", mode: "cypher", ext: ["cyp", "cypher"]},
{name: "Cython", mime: "text/x-cython", mode: "python", ext: ["pyx", "pxd", "pxi"]},
@@ -47,6 +47,7 @@
{name: "Embedded Javascript", mime: "application/x-ejs", mode: "htmlembedded", ext: ["ejs"]},
{name: "Embedded Ruby", mime: "application/x-erb", mode: "htmlembedded", ext: ["erb"]},
{name: "Erlang", mime: "text/x-erlang", mode: "erlang", ext: ["erl"]},
+ {name: "Esper", mime: "text/x-esper", mode: "sql"},
{name: "Factor", mime: "text/x-factor", mode: "factor", ext: ["factor"]},
{name: "FCL", mime: "text/x-fcl", mode: "fcl"},
{name: "Forth", mime: "text/x-forth", mode: "forth", ext: ["forth", "fth", "4th"]},
@@ -63,7 +64,7 @@
{name: "Haxe", mime: "text/x-haxe", mode: "haxe", ext: ["hx"]},
{name: "HXML", mime: "text/x-hxml", mode: "haxe", ext: ["hxml"]},
{name: "ASP.NET", mime: "application/x-aspx", mode: "htmlembedded", ext: ["aspx"], alias: ["asp", "aspx"]},
- {name: "HTML", mime: "text/html", mode: "htmlmixed", ext: ["html", "htm"], alias: ["xhtml"]},
+ {name: "HTML", mime: "text/html", mode: "htmlmixed", ext: ["html", "htm", "handlebars", "hbs"], alias: ["xhtml"]},
{name: "HTTP", mime: "message/http", mode: "http"},
{name: "IDL", mime: "text/x-idl", mode: "idl", ext: ["pro"]},
{name: "Pug", mime: "text/x-pug", mode: "pug", ext: ["jade", "pug"], alias: ["jade"]},
@@ -91,15 +92,16 @@
{name: "MySQL", mime: "text/x-mysql", mode: "sql"},
{name: "Nginx", mime: "text/x-nginx-conf", mode: "nginx", file: /nginx.*\.conf$/i},
{name: "NSIS", mime: "text/x-nsis", mode: "nsis", ext: ["nsh", "nsi"]},
- {name: "NTriples", mime: "text/n-triples", mode: "ntriples", ext: ["nt"]},
- {name: "Objective C", mime: "text/x-objectivec", mode: "clike", ext: ["m", "mm"], alias: ["objective-c", "objc"]},
+ {name: "NTriples", mimes: ["application/n-triples", "application/n-quads", "text/n-triples"],
+ mode: "ntriples", ext: ["nt", "nq"]},
+ {name: "Objective-C", mime: "text/x-objectivec", mode: "clike", ext: ["m", "mm"], alias: ["objective-c", "objc"]},
{name: "OCaml", mime: "text/x-ocaml", mode: "mllike", ext: ["ml", "mli", "mll", "mly"]},
{name: "Octave", mime: "text/x-octave", mode: "octave", ext: ["m"]},
{name: "Oz", mime: "text/x-oz", mode: "oz", ext: ["oz"]},
{name: "Pascal", mime: "text/x-pascal", mode: "pascal", ext: ["p", "pas"]},
{name: "PEG.js", mime: "null", mode: "pegjs", ext: ["jsonld"]},
{name: "Perl", mime: "text/x-perl", mode: "perl", ext: ["pl", "pm"]},
- {name: "PHP", mime: "application/x-httpd-php", mode: "php", ext: ["php", "php3", "php4", "php5", "phtml"]},
+ {name: "PHP", mimes: ["text/x-php", "application/x-httpd-php", "application/x-httpd-php-open"], mode: "php", ext: ["php", "php3", "php4", "php5", "php7", "phtml"]},
{name: "Pig", mime: "text/x-pig", mode: "pig", ext: ["pig"]},
{name: "Plain Text", mime: "text/plain", mode: "null", ext: ["txt", "text", "conf", "def", "list", "log"]},
{name: "PLSQL", mime: "text/x-plsql", mode: "sql", ext: ["pls"]},
@@ -120,22 +122,24 @@
{name: "Scala", mime: "text/x-scala", mode: "clike", ext: ["scala"]},
{name: "Scheme", mime: "text/x-scheme", mode: "scheme", ext: ["scm", "ss"]},
{name: "SCSS", mime: "text/x-scss", mode: "css", ext: ["scss"]},
- {name: "Shell", mime: "text/x-sh", mode: "shell", ext: ["sh", "ksh", "bash"], alias: ["bash", "sh", "zsh"], file: /^PKGBUILD$/},
+ {name: "Shell", mimes: ["text/x-sh", "application/x-sh"], mode: "shell", ext: ["sh", "ksh", "bash"], alias: ["bash", "sh", "zsh"], file: /^PKGBUILD$/},
{name: "Sieve", mime: "application/sieve", mode: "sieve", ext: ["siv", "sieve"]},
{name: "Slim", mimes: ["text/x-slim", "application/x-slim"], mode: "slim", ext: ["slim"]},
{name: "Smalltalk", mime: "text/x-stsrc", mode: "smalltalk", ext: ["st"]},
{name: "Smarty", mime: "text/x-smarty", mode: "smarty", ext: ["tpl"]},
{name: "Solr", mime: "text/x-solr", mode: "solr"},
+ {name: "SML", mime: "text/x-sml", mode: "mllike", ext: ["sml", "sig", "fun", "smackspec"]},
{name: "Soy", mime: "text/x-soy", mode: "soy", ext: ["soy"], alias: ["closure template"]},
{name: "SPARQL", mime: "application/sparql-query", mode: "sparql", ext: ["rq", "sparql"], alias: ["sparul"]},
{name: "Spreadsheet", mime: "text/x-spreadsheet", mode: "spreadsheet", alias: ["excel", "formula"]},
{name: "SQL", mime: "text/x-sql", mode: "sql", ext: ["sql"]},
+ {name: "SQLite", mime: "text/x-sqlite", mode: "sql"},
{name: "Squirrel", mime: "text/x-squirrel", mode: "clike", ext: ["nut"]},
{name: "Stylus", mime: "text/x-styl", mode: "stylus", ext: ["styl"]},
{name: "Swift", mime: "text/x-swift", mode: "swift", ext: ["swift"]},
{name: "sTeX", mime: "text/x-stex", mode: "stex"},
- {name: "LaTeX", mime: "text/x-latex", mode: "stex", ext: ["text", "ltx"], alias: ["tex"]},
- {name: "SystemVerilog", mime: "text/x-systemverilog", mode: "verilog", ext: ["v"]},
+ {name: "LaTeX", mime: "text/x-latex", mode: "stex", ext: ["text", "ltx", "tex"], alias: ["tex"]},
+ {name: "SystemVerilog", mime: "text/x-systemverilog", mode: "verilog", ext: ["v", "sv", "svh"]},
{name: "Tcl", mime: "text/x-tcl", mode: "tcl", ext: ["tcl"]},
{name: "Textile", mime: "text/x-textile", mode: "textile", ext: ["textile"]},
{name: "TiddlyWiki ", mime: "text/x-tiddlywiki", mode: "tiddlywiki"},
@@ -147,6 +151,7 @@
{name: "TTCN_CFG", mime: "text/x-ttcn-cfg", mode: "ttcn-cfg", ext: ["cfg"]},
{name: "Turtle", mime: "text/turtle", mode: "turtle", ext: ["ttl"]},
{name: "TypeScript", mime: "application/typescript", mode: "javascript", ext: ["ts"], alias: ["ts"]},
+ {name: "TypeScript-JSX", mime: "text/typescript-jsx", mode: "jsx", ext: ["tsx"], alias: ["tsx"]},
{name: "Twig", mime: "text/x-twig", mode: "twig"},
{name: "Web IDL", mime: "text/x-webidl", mode: "webidl", ext: ["webidl"]},
{name: "VB.NET", mime: "text/x-vb", mode: "vb", ext: ["vb"]},
diff --git a/js/codemirror-5.23.0/mode/mirc/index.html b/js/codemirror-5.39.0/mode/mirc/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/mirc/index.html
rename to js/codemirror-5.39.0/mode/mirc/index.html
diff --git a/js/codemirror-5.23.0/mode/mirc/mirc.js b/js/codemirror-5.39.0/mode/mirc/mirc.js
similarity index 99%
rename from js/codemirror-5.23.0/mode/mirc/mirc.js
rename to js/codemirror-5.39.0/mode/mirc/mirc.js
index f0d5c6a..71ac4dd 100644
--- a/js/codemirror-5.23.0/mode/mirc/mirc.js
+++ b/js/codemirror-5.39.0/mode/mirc/mirc.js
@@ -130,7 +130,7 @@ CodeMirror.defineMode("mirc", function() {
}
}
else if (ch == "%") {
- stream.eatWhile(/[^,^\s^\(^\)]/);
+ stream.eatWhile(/[^,\s()]/);
state.beforeParams = true;
return "string";
}
diff --git a/js/codemirror-5.23.0/mode/mllike/index.html b/js/codemirror-5.39.0/mode/mllike/index.html
similarity index 95%
rename from js/codemirror-5.23.0/mode/mllike/index.html
rename to js/codemirror-5.39.0/mode/mllike/index.html
index 5923af8..b1ed6c7 100644
--- a/js/codemirror-5.23.0/mode/mllike/index.html
+++ b/js/codemirror-5.39.0/mode/mllike/index.html
@@ -132,6 +132,25 @@
OCaml mode
(* A Hundred Lines of Caml - http://caml.inria.fr/about/taste.en.html *)
(* OCaml page on Wikipedia - http://en.wikipedia.org/wiki/OCaml *)
+
+module type S = sig type t end
+
+let x = {|
+ this is a long string
+ with many lines and stuff
+ |}
+
+let b = 0b00110
+let h = 0x123abcd
+let e = 1e-10
+let i = 1.
+let x = 30_000
+let o = 0o1234
+
+[1; 2; 3] (* lists *)
+
+1 @ 2
+1. +. 2.
F# mode
diff --git a/js/codemirror-5.23.0/mode/mllike/mllike.js b/js/codemirror-5.39.0/mode/mllike/mllike.js
similarity index 54%
rename from js/codemirror-5.23.0/mode/mllike/mllike.js
rename to js/codemirror-5.39.0/mode/mllike/mllike.js
index 4d0be60..92b51cb 100644
--- a/js/codemirror-5.23.0/mode/mllike/mllike.js
+++ b/js/codemirror-5.39.0/mode/mllike/mllike.js
@@ -13,31 +13,26 @@
CodeMirror.defineMode('mllike', function(_config, parserConfig) {
var words = {
- 'let': 'keyword',
- 'rec': 'keyword',
+ 'as': 'keyword',
+ 'do': 'keyword',
+ 'else': 'keyword',
+ 'end': 'keyword',
+ 'exception': 'keyword',
+ 'fun': 'keyword',
+ 'functor': 'keyword',
+ 'if': 'keyword',
'in': 'keyword',
+ 'include': 'keyword',
+ 'let': 'keyword',
'of': 'keyword',
- 'and': 'keyword',
- 'if': 'keyword',
+ 'open': 'keyword',
+ 'rec': 'keyword',
+ 'struct': 'keyword',
'then': 'keyword',
- 'else': 'keyword',
- 'for': 'keyword',
- 'to': 'keyword',
- 'while': 'keyword',
- 'do': 'keyword',
- 'done': 'keyword',
- 'fun': 'keyword',
- 'function': 'keyword',
- 'val': 'keyword',
'type': 'keyword',
- 'mutable': 'keyword',
- 'match': 'keyword',
- 'with': 'keyword',
- 'try': 'keyword',
- 'open': 'builtin',
- 'ignore': 'builtin',
- 'begin': 'keyword',
- 'end': 'keyword'
+ 'val': 'keyword',
+ 'while': 'keyword',
+ 'with': 'keyword'
};
var extraWords = parserConfig.extraWords || {};
@@ -54,6 +49,13 @@ CodeMirror.defineMode('mllike', function(_config, parserConfig) {
state.tokenize = tokenString;
return state.tokenize(stream, state);
}
+ if (ch === '{') {
+ if (stream.eat('|')) {
+ state.longString = true;
+ state.tokenize = tokenLongString;
+ return state.tokenize(stream, state);
+ }
+ }
if (ch === '(') {
if (stream.eat('*')) {
state.commentLevel++;
@@ -61,7 +63,7 @@ CodeMirror.defineMode('mllike', function(_config, parserConfig) {
return state.tokenize(stream, state);
}
}
- if (ch === '~') {
+ if (ch === '~' || ch === '?') {
stream.eatWhile(/\w/);
return 'variable-2';
}
@@ -74,13 +76,24 @@ CodeMirror.defineMode('mllike', function(_config, parserConfig) {
return 'comment';
}
if (/\d/.test(ch)) {
- stream.eatWhile(/[\d]/);
- if (stream.eat('.')) {
- stream.eatWhile(/[\d]/);
+ if (ch === '0' && stream.eat(/[bB]/)) {
+ stream.eatWhile(/[01]/);
+ } if (ch === '0' && stream.eat(/[xX]/)) {
+ stream.eatWhile(/[0-9a-fA-F]/)
+ } if (ch === '0' && stream.eat(/[oO]/)) {
+ stream.eatWhile(/[0-7]/);
+ } else {
+ stream.eatWhile(/[\d_]/);
+ if (stream.eat('.')) {
+ stream.eatWhile(/[\d]/);
+ }
+ if (stream.eat(/[eE]/)) {
+ stream.eatWhile(/[\d\-+]/);
+ }
}
return 'number';
}
- if ( /[+\-*&%=<>!?|]/.test(ch)) {
+ if ( /[+\-*&%=<>!?|@\.~:]/.test(ch)) {
return 'operator';
}
if (/[\w\xa1-\uffff]/.test(ch)) {
@@ -119,8 +132,20 @@ CodeMirror.defineMode('mllike', function(_config, parserConfig) {
return 'comment';
}
+ function tokenLongString(stream, state) {
+ var prev, next;
+ while (state.longString && (next = stream.next()) != null) {
+ if (prev === '|' && next === '}') state.longString = false;
+ prev = next;
+ }
+ if (!state.longString) {
+ state.tokenize = tokenBase;
+ }
+ return 'string';
+ }
+
return {
- startState: function() {return {tokenize: tokenBase, commentLevel: 0};},
+ startState: function() {return {tokenize: tokenBase, commentLevel: 0, longString: false};},
token: function(stream, state) {
if (stream.eatSpace()) return null;
return state.tokenize(stream, state);
@@ -135,14 +160,64 @@ CodeMirror.defineMode('mllike', function(_config, parserConfig) {
CodeMirror.defineMIME('text/x-ocaml', {
name: 'mllike',
extraWords: {
- 'succ': 'keyword',
+ 'and': 'keyword',
+ 'assert': 'keyword',
+ 'begin': 'keyword',
+ 'class': 'keyword',
+ 'constraint': 'keyword',
+ 'done': 'keyword',
+ 'downto': 'keyword',
+ 'external': 'keyword',
+ 'function': 'keyword',
+ 'initializer': 'keyword',
+ 'lazy': 'keyword',
+ 'match': 'keyword',
+ 'method': 'keyword',
+ 'module': 'keyword',
+ 'mutable': 'keyword',
+ 'new': 'keyword',
+ 'nonrec': 'keyword',
+ 'object': 'keyword',
+ 'private': 'keyword',
+ 'sig': 'keyword',
+ 'to': 'keyword',
+ 'try': 'keyword',
+ 'value': 'keyword',
+ 'virtual': 'keyword',
+ 'when': 'keyword',
+
+ // builtins
+ 'raise': 'builtin',
+ 'failwith': 'builtin',
+ 'true': 'builtin',
+ 'false': 'builtin',
+
+ // Pervasives builtins
+ 'asr': 'builtin',
+ 'land': 'builtin',
+ 'lor': 'builtin',
+ 'lsl': 'builtin',
+ 'lsr': 'builtin',
+ 'lxor': 'builtin',
+ 'mod': 'builtin',
+ 'or': 'builtin',
+
+ // More Pervasives
+ 'raise_notrace': 'builtin',
'trace': 'builtin',
'exit': 'builtin',
'print_string': 'builtin',
'print_endline': 'builtin',
- 'true': 'atom',
- 'false': 'atom',
- 'raise': 'keyword'
+
+ 'int': 'type',
+ 'float': 'type',
+ 'bool': 'type',
+ 'char': 'type',
+ 'string': 'type',
+ 'unit': 'type',
+
+ // Modules
+ 'List': 'builtin'
}
});
@@ -150,18 +225,21 @@ CodeMirror.defineMIME('text/x-fsharp', {
name: 'mllike',
extraWords: {
'abstract': 'keyword',
- 'as': 'keyword',
'assert': 'keyword',
'base': 'keyword',
+ 'begin': 'keyword',
'class': 'keyword',
'default': 'keyword',
'delegate': 'keyword',
+ 'do!': 'keyword',
+ 'done': 'keyword',
'downcast': 'keyword',
'downto': 'keyword',
'elif': 'keyword',
- 'exception': 'keyword',
'extern': 'keyword',
'finally': 'keyword',
+ 'for': 'keyword',
+ 'function': 'keyword',
'global': 'keyword',
'inherit': 'keyword',
'inline': 'keyword',
@@ -169,38 +247,108 @@ CodeMirror.defineMIME('text/x-fsharp', {
'internal': 'keyword',
'lazy': 'keyword',
'let!': 'keyword',
- 'member' : 'keyword',
+ 'match': 'keyword',
+ 'member': 'keyword',
'module': 'keyword',
+ 'mutable': 'keyword',
'namespace': 'keyword',
'new': 'keyword',
'null': 'keyword',
'override': 'keyword',
'private': 'keyword',
'public': 'keyword',
- 'return': 'keyword',
'return!': 'keyword',
+ 'return': 'keyword',
'select': 'keyword',
'static': 'keyword',
- 'struct': 'keyword',
+ 'to': 'keyword',
+ 'try': 'keyword',
'upcast': 'keyword',
- 'use': 'keyword',
'use!': 'keyword',
- 'val': 'keyword',
+ 'use': 'keyword',
+ 'void': 'keyword',
'when': 'keyword',
- 'yield': 'keyword',
'yield!': 'keyword',
+ 'yield': 'keyword',
+
+ // Reserved words
+ 'atomic': 'keyword',
+ 'break': 'keyword',
+ 'checked': 'keyword',
+ 'component': 'keyword',
+ 'const': 'keyword',
+ 'constraint': 'keyword',
+ 'constructor': 'keyword',
+ 'continue': 'keyword',
+ 'eager': 'keyword',
+ 'event': 'keyword',
+ 'external': 'keyword',
+ 'fixed': 'keyword',
+ 'method': 'keyword',
+ 'mixin': 'keyword',
+ 'object': 'keyword',
+ 'parallel': 'keyword',
+ 'process': 'keyword',
+ 'protected': 'keyword',
+ 'pure': 'keyword',
+ 'sealed': 'keyword',
+ 'tailcall': 'keyword',
+ 'trait': 'keyword',
+ 'virtual': 'keyword',
+ 'volatile': 'keyword',
+ // builtins
'List': 'builtin',
'Seq': 'builtin',
'Map': 'builtin',
'Set': 'builtin',
+ 'Option': 'builtin',
'int': 'builtin',
'string': 'builtin',
- 'raise': 'builtin',
- 'failwith': 'builtin',
'not': 'builtin',
'true': 'builtin',
- 'false': 'builtin'
+ 'false': 'builtin',
+
+ 'raise': 'builtin',
+ 'failwith': 'builtin'
+ },
+ slashComments: true
+});
+
+
+CodeMirror.defineMIME('text/x-sml', {
+ name: 'mllike',
+ extraWords: {
+ 'abstype': 'keyword',
+ 'and': 'keyword',
+ 'andalso': 'keyword',
+ 'case': 'keyword',
+ 'datatype': 'keyword',
+ 'fn': 'keyword',
+ 'handle': 'keyword',
+ 'infix': 'keyword',
+ 'infixr': 'keyword',
+ 'local': 'keyword',
+ 'nonfix': 'keyword',
+ 'op': 'keyword',
+ 'orelse': 'keyword',
+ 'raise': 'keyword',
+ 'withtype': 'keyword',
+ 'eqtype': 'keyword',
+ 'sharing': 'keyword',
+ 'sig': 'keyword',
+ 'signature': 'keyword',
+ 'structure': 'keyword',
+ 'where': 'keyword',
+ 'true': 'keyword',
+ 'false': 'keyword',
+
+ // types
+ 'int': 'builtin',
+ 'real': 'builtin',
+ 'string': 'builtin',
+ 'char': 'builtin',
+ 'bool': 'builtin'
},
slashComments: true
});
diff --git a/js/codemirror-5.23.0/mode/modelica/index.html b/js/codemirror-5.39.0/mode/modelica/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/modelica/index.html
rename to js/codemirror-5.39.0/mode/modelica/index.html
diff --git a/js/codemirror-5.23.0/mode/modelica/modelica.js b/js/codemirror-5.39.0/mode/modelica/modelica.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/modelica/modelica.js
rename to js/codemirror-5.39.0/mode/modelica/modelica.js
diff --git a/js/codemirror-5.23.0/mode/mscgen/index.html b/js/codemirror-5.39.0/mode/mscgen/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/mscgen/index.html
rename to js/codemirror-5.39.0/mode/mscgen/index.html
diff --git a/js/codemirror-5.23.0/mode/mscgen/mscgen.js b/js/codemirror-5.39.0/mode/mscgen/mscgen.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/mscgen/mscgen.js
rename to js/codemirror-5.39.0/mode/mscgen/mscgen.js
diff --git a/js/codemirror-5.23.0/mode/mscgen/mscgen_test.js b/js/codemirror-5.39.0/mode/mscgen/mscgen_test.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/mscgen/mscgen_test.js
rename to js/codemirror-5.39.0/mode/mscgen/mscgen_test.js
diff --git a/js/codemirror-5.23.0/mode/mscgen/msgenny_test.js b/js/codemirror-5.39.0/mode/mscgen/msgenny_test.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/mscgen/msgenny_test.js
rename to js/codemirror-5.39.0/mode/mscgen/msgenny_test.js
diff --git a/js/codemirror-5.23.0/mode/mscgen/xu_test.js b/js/codemirror-5.39.0/mode/mscgen/xu_test.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/mscgen/xu_test.js
rename to js/codemirror-5.39.0/mode/mscgen/xu_test.js
diff --git a/js/codemirror-5.23.0/mode/mumps/index.html b/js/codemirror-5.39.0/mode/mumps/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/mumps/index.html
rename to js/codemirror-5.39.0/mode/mumps/index.html
diff --git a/js/codemirror-5.23.0/mode/mumps/mumps.js b/js/codemirror-5.39.0/mode/mumps/mumps.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/mumps/mumps.js
rename to js/codemirror-5.39.0/mode/mumps/mumps.js
diff --git a/js/codemirror-5.23.0/mode/nginx/index.html b/js/codemirror-5.39.0/mode/nginx/index.html
similarity index 98%
rename from js/codemirror-5.23.0/mode/nginx/index.html
rename to js/codemirror-5.39.0/mode/nginx/index.html
index 03cf671..dde5457 100644
--- a/js/codemirror-5.23.0/mode/nginx/index.html
+++ b/js/codemirror-5.39.0/mode/nginx/index.html
@@ -1,4 +1,4 @@
-
+
CodeMirror: NGINX mode
@@ -176,6 +176,6 @@
NGINX mode
var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
-
MIME types defined: text/nginx.
+
MIME types defined: text/x-nginx-conf.
diff --git a/js/codemirror-5.23.0/mode/nginx/nginx.js b/js/codemirror-5.39.0/mode/nginx/nginx.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/nginx/nginx.js
rename to js/codemirror-5.39.0/mode/nginx/nginx.js
diff --git a/js/codemirror-5.23.0/mode/nsis/index.html b/js/codemirror-5.39.0/mode/nsis/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/nsis/index.html
rename to js/codemirror-5.39.0/mode/nsis/index.html
diff --git a/js/codemirror-5.23.0/mode/nsis/nsis.js b/js/codemirror-5.39.0/mode/nsis/nsis.js
similarity index 57%
rename from js/codemirror-5.23.0/mode/nsis/nsis.js
rename to js/codemirror-5.39.0/mode/nsis/nsis.js
index dc8c74c..69bc950 100644
--- a/js/codemirror-5.23.0/mode/nsis/nsis.js
+++ b/js/codemirror-5.39.0/mode/nsis/nsis.js
@@ -24,20 +24,20 @@ CodeMirror.defineSimpleMode("nsis",{
{ regex: /`(?:[^\\`]|\\.)*`?/, token: "string" },
// Compile Time Commands
- {regex: /^\s*(?:\!(include|addincludedir|addplugindir|appendfile|cd|delfile|echo|error|execute|packhdr|finalize|getdllversion|system|tempfile|warning|verbose|define|undef|insertmacro|makensis|searchparse|searchreplace))\b/, token: "keyword"},
+ {regex: /^\s*(?:\!(include|addincludedir|addplugindir|appendfile|cd|delfile|echo|error|execute|packhdr|pragma|finalize|getdllversion|gettlbversion|system|tempfile|warning|verbose|define|undef|insertmacro|macro|macroend|makensis|searchparse|searchreplace))\b/, token: "keyword"},
// Conditional Compilation
{regex: /^\s*(?:\!(if(?:n?def)?|ifmacron?def|macro))\b/, token: "keyword", indent: true},
{regex: /^\s*(?:\!(else|endif|macroend))\b/, token: "keyword", dedent: true},
// Runtime Commands
- {regex: /^\s*(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetLabelAddress|GetTempFileName|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|IntCmp|IntCmpU|IntFmt|IntOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegStr|WriteUninstaller|XPStyle)\b/, token: "keyword"},
+ {regex: /^\s*(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecShellWait|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetLabelAddress|GetTempFileName|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|Int64Cmp|Int64CmpU|Int64Fmt|IntCmp|IntCmpU|IntFmt|IntOp|IntPtrCmp|IntPtrCmpU|IntPtrOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|PEDllCharacteristics|PESubsysVer|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegMultiStr|WriteRegNone|WriteRegStr|WriteUninstaller|XPStyle)\b/, token: "keyword"},
{regex: /^\s*(?:Function|PageEx|Section(?:Group)?)\b/, token: "keyword", indent: true},
{regex: /^\s*(?:(Function|PageEx|Section(?:Group)?)End)\b/, token: "keyword", dedent: true},
// Command Options
- {regex: /\b(?:ARCHIVE|FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_NORMAL|FILE_ATTRIBUTE_OFFLINE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_TEMPORARY|HIDDEN|HKCC|HKCR|HKCU|HKDD|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_DYN_DATA|HKEY_LOCAL_MACHINE|HKEY_PERFORMANCE_DATA|HKEY_USERS|HKLM|HKPD|HKU|IDABORT|IDCANCEL|IDD_DIR|IDD_INST|IDD_INSTFILES|IDD_LICENSE|IDD_SELCOM|IDD_UNINST|IDD_VERIFY|IDIGNORE|IDNO|IDOK|IDRETRY|IDYES|MB_ABORTRETRYIGNORE|MB_DEFBUTTON1|MB_DEFBUTTON2|MB_DEFBUTTON3|MB_DEFBUTTON4|MB_ICONEXCLAMATION|MB_ICONINFORMATION|MB_ICONQUESTION|MB_ICONSTOP|MB_OK|MB_OKCANCEL|MB_RETRYCANCEL|MB_RIGHT|MB_RTLREADING|MB_SETFOREGROUND|MB_TOPMOST|MB_USERICON|MB_YESNO|MB_YESNOCANCEL|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SW_HIDE|SW_SHOWDEFAULT|SW_SHOWMAXIMIZED|SW_SHOWMINIMIZED|SW_SHOWNORMAL|SYSTEM|TEMPORARY)\b/, token: "atom"},
- {regex: /\b(?:admin|all|auto|both|bottom|bzip2|components|current|custom|directory|force|hide|highest|ifdiff|ifnewer|instfiles|lastused|leave|left|license|listonly|lzma|nevershow|none|normal|notset|right|show|silent|silentlog|textonly|top|try|un\.components|un\.custom|un\.directory|un\.instfiles|un\.license|uninstConfirm|user|Win10|Win7|Win8|WinVista|zlib)\b/, token: "builtin"},
+ {regex: /\b(?:ARCHIVE|FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_NORMAL|FILE_ATTRIBUTE_OFFLINE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_TEMPORARY|HIDDEN|HKCC|HKCR(32|64)?|HKCU(32|64)?|HKDD|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_DYN_DATA|HKEY_LOCAL_MACHINE|HKEY_PERFORMANCE_DATA|HKEY_USERS|HKLM(32|64)?|HKPD|HKU|IDABORT|IDCANCEL|IDD_DIR|IDD_INST|IDD_INSTFILES|IDD_LICENSE|IDD_SELCOM|IDD_UNINST|IDD_VERIFY|IDIGNORE|IDNO|IDOK|IDRETRY|IDYES|MB_ABORTRETRYIGNORE|MB_DEFBUTTON1|MB_DEFBUTTON2|MB_DEFBUTTON3|MB_DEFBUTTON4|MB_ICONEXCLAMATION|MB_ICONINFORMATION|MB_ICONQUESTION|MB_ICONSTOP|MB_OK|MB_OKCANCEL|MB_RETRYCANCEL|MB_RIGHT|MB_RTLREADING|MB_SETFOREGROUND|MB_TOPMOST|MB_USERICON|MB_YESNO|MB_YESNOCANCEL|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SW_HIDE|SW_SHOWDEFAULT|SW_SHOWMAXIMIZED|SW_SHOWMINIMIZED|SW_SHOWNORMAL|SYSTEM|TEMPORARY)\b/, token: "atom"},
+ {regex: /\b(?:admin|all|auto|both|bottom|bzip2|components|current|custom|directory|false|force|hide|highest|ifdiff|ifnewer|instfiles|lastused|leave|left|license|listonly|lzma|nevershow|none|normal|notset|off|on|right|show|silent|silentlog|textonly|top|true|try|un\.components|un\.custom|un\.directory|un\.instfiles|un\.license|uninstConfirm|user|Win10|Win7|Win8|WinVista|zlib)\b/, token: "builtin"},
// LogicLib.nsh
{regex: /\$\{(?:And(?:If(?:Not)?|Unless)|Break|Case(?:Else)?|Continue|Default|Do(?:Until|While)?|Else(?:If(?:Not)?|Unless)?|End(?:If|Select|Switch)|Exit(?:Do|For|While)|For(?:Each)?|If(?:Cmd|Not(?:Then)?|Then)?|Loop(?:Until|While)?|Or(?:If(?:Not)?|Unless)|Select|Switch|Unless|While)\}/, token: "variable-2", indent: true},
diff --git a/js/codemirror-5.39.0/mode/ntriples/index.html b/js/codemirror-5.39.0/mode/ntriples/index.html
new file mode 100644
index 0000000..9c99846
--- /dev/null
+++ b/js/codemirror-5.39.0/mode/ntriples/index.html
@@ -0,0 +1,70 @@
+
+
+
CodeMirror: N-Triples mode
+
+
+
+
+
+
+
+
+
+
+
+ The N-Triples mode also works well with on
+ N-Quad documents.
+
+
+
+ .
+ "literal 1" .
+ _:bnode3 .
+_:bnode4 "literal 2"@lang .
+_:bnode5 "literal 3"^^ .
+
+
+
+
+ MIME types defined: application/n-triples.
+
+
+ N-Quads add a fourth
+ element to the statement to track which graph the statement is from.
+ Otherwise, it's identical to N-Triples.
+
+
+
+ .
+ "literal 1" .
+ _:bnode3 .
+ _:bnode4 "literal 2"@lang .
+ # if a graph labe
+ _:bnode5 "literal 3"^^ .
+
+
+
+
+ MIME types defined: application/n-quads.
+
diff --git a/js/codemirror-5.23.0/mode/ntriples/ntriples.js b/js/codemirror-5.39.0/mode/ntriples/ntriples.js
similarity index 92%
rename from js/codemirror-5.23.0/mode/ntriples/ntriples.js
rename to js/codemirror-5.39.0/mode/ntriples/ntriples.js
index 0524b1e..148272e 100644
--- a/js/codemirror-5.23.0/mode/ntriples/ntriples.js
+++ b/js/codemirror-5.39.0/mode/ntriples/ntriples.js
@@ -3,9 +3,9 @@
/**********************************************************
* This script provides syntax highlighting support for
-* the Ntriples format.
-* Ntriples format specification:
-* http://www.w3.org/TR/rdf-testcases/#ntriples
+* the N-Triples format.
+* N-Triples format specification:
+* https://www.w3.org/TR/n-triples/
***********************************************************/
/*
@@ -181,6 +181,15 @@ CodeMirror.defineMode("ntriples", function() {
};
});
+// define the registered Media Type for n-triples:
+// https://www.w3.org/TR/n-triples/#n-triples-mediatype
+CodeMirror.defineMIME("application/n-triples", "ntriples");
+
+// N-Quads is based on the N-Triples format (so same highlighting works)
+// https://www.w3.org/TR/n-quads/
+CodeMirror.defineMIME("application/n-quads", "ntriples");
+
+// previously used, though technically incorrect media type for n-triples
CodeMirror.defineMIME("text/n-triples", "ntriples");
});
diff --git a/js/codemirror-5.23.0/mode/octave/index.html b/js/codemirror-5.39.0/mode/octave/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/octave/index.html
rename to js/codemirror-5.39.0/mode/octave/index.html
diff --git a/js/codemirror-5.23.0/mode/octave/octave.js b/js/codemirror-5.39.0/mode/octave/octave.js
similarity index 95%
rename from js/codemirror-5.23.0/mode/octave/octave.js
rename to js/codemirror-5.39.0/mode/octave/octave.js
index a7bec03..b77ad68 100644
--- a/js/codemirror-5.23.0/mode/octave/octave.js
+++ b/js/codemirror-5.39.0/mode/octave/octave.js
@@ -90,8 +90,8 @@ CodeMirror.defineMode("octave", function() {
if (stream.match(wordRegexp(['nan','NaN','inf','Inf']))) { return 'number'; };
// Handle Strings
- if (stream.match(/^"([^"]|(""))*"/)) { return 'string'; } ;
- if (stream.match(/^'([^']|(''))*'/)) { return 'string'; } ;
+ var m = stream.match(/^"(?:[^"]|"")*("|$)/) || stream.match(/^'(?:[^']|'')*('|$)/)
+ if (m) { return m[1] ? 'string' : "string error"; }
// Handle words
if (stream.match(keywords)) { return 'keyword'; } ;
@@ -126,7 +126,11 @@ CodeMirror.defineMode("octave", function() {
state.tokenize = tokenTranspose;
}
return style;
- }
+ },
+
+ lineComment: '%',
+
+ fold: 'indent'
};
});
diff --git a/js/codemirror-5.23.0/mode/oz/index.html b/js/codemirror-5.39.0/mode/oz/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/oz/index.html
rename to js/codemirror-5.39.0/mode/oz/index.html
diff --git a/js/codemirror-5.23.0/mode/oz/oz.js b/js/codemirror-5.39.0/mode/oz/oz.js
similarity index 98%
rename from js/codemirror-5.23.0/mode/oz/oz.js
rename to js/codemirror-5.39.0/mode/oz/oz.js
index ee8cb0a..50ffda3 100644
--- a/js/codemirror-5.23.0/mode/oz/oz.js
+++ b/js/codemirror-5.39.0/mode/oz/oz.js
@@ -27,7 +27,7 @@ CodeMirror.defineMode("oz", function (conf) {
var atoms = wordRegexp(["true", "false", "nil", "unit"]);
var commonKeywords = wordRegexp(["andthen", "at", "attr", "declare", "feat", "from", "lex",
- "mod", "mode", "orelse", "parser", "prod", "prop", "scanner", "self", "syn", "token"]);
+ "mod", "div", "mode", "orelse", "parser", "prod", "prop", "scanner", "self", "syn", "token"]);
var openingKeywords = wordRegexp(["local", "proc", "fun", "case", "class", "if", "cond", "or", "dis",
"choice", "not", "thread", "try", "raise", "lock", "for", "suchthat", "meth", "functor"]);
var middleKeywords = wordRegexp(middle);
diff --git a/js/codemirror-5.23.0/mode/pascal/index.html b/js/codemirror-5.39.0/mode/pascal/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/pascal/index.html
rename to js/codemirror-5.39.0/mode/pascal/index.html
diff --git a/js/codemirror-5.23.0/mode/pascal/pascal.js b/js/codemirror-5.39.0/mode/pascal/pascal.js
similarity index 70%
rename from js/codemirror-5.23.0/mode/pascal/pascal.js
rename to js/codemirror-5.39.0/mode/pascal/pascal.js
index 2d0c3d4..3240532 100644
--- a/js/codemirror-5.23.0/mode/pascal/pascal.js
+++ b/js/codemirror-5.39.0/mode/pascal/pascal.js
@@ -17,9 +17,21 @@ CodeMirror.defineMode("pascal", function() {
for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
return obj;
}
- var keywords = words("and array begin case const div do downto else end file for forward integer " +
- "boolean char function goto if in label mod nil not of or packed procedure " +
- "program record repeat set string then to type until var while with");
+ var keywords = words(
+ "absolute and array asm begin case const constructor destructor div do " +
+ "downto else end file for function goto if implementation in inherited " +
+ "inline interface label mod nil not object of operator or packed procedure " +
+ "program record reintroduce repeat self set shl shr string then to type " +
+ "unit until uses var while with xor as class dispinterface except exports " +
+ "finalization finally initialization inline is library on out packed " +
+ "property raise resourcestring threadvar try absolute abstract alias " +
+ "assembler bitpacked break cdecl continue cppdecl cvar default deprecated " +
+ "dynamic enumerator experimental export external far far16 forward generic " +
+ "helper implements index interrupt iocheck local message name near " +
+ "nodefault noreturn nostackframe oldfpccall otherwise overload override " +
+ "pascal platform private protected public published read register " +
+ "reintroduce result safecall saveregisters softfloat specialize static " +
+ "stdcall stored strict unaligned unimplemented varargs virtual write");
var atoms = {"null": true};
var isOperatorChar = /[+\-*&%=<>!?|\/]/;
diff --git a/js/codemirror-5.23.0/mode/pegjs/index.html b/js/codemirror-5.39.0/mode/pegjs/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/pegjs/index.html
rename to js/codemirror-5.39.0/mode/pegjs/index.html
diff --git a/js/codemirror-5.23.0/mode/pegjs/pegjs.js b/js/codemirror-5.39.0/mode/pegjs/pegjs.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/pegjs/pegjs.js
rename to js/codemirror-5.39.0/mode/pegjs/pegjs.js
diff --git a/js/codemirror-5.23.0/mode/perl/index.html b/js/codemirror-5.39.0/mode/perl/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/perl/index.html
rename to js/codemirror-5.39.0/mode/perl/index.html
diff --git a/js/codemirror-5.23.0/mode/perl/perl.js b/js/codemirror-5.39.0/mode/perl/perl.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/perl/perl.js
rename to js/codemirror-5.39.0/mode/perl/perl.js
diff --git a/js/codemirror-5.23.0/mode/php/index.html b/js/codemirror-5.39.0/mode/php/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/php/index.html
rename to js/codemirror-5.39.0/mode/php/index.html
diff --git a/js/codemirror-5.23.0/mode/php/php.js b/js/codemirror-5.39.0/mode/php/php.js
similarity index 99%
rename from js/codemirror-5.23.0/mode/php/php.js
rename to js/codemirror-5.39.0/mode/php/php.js
index 57ba812..589c9a6 100644
--- a/js/codemirror-5.23.0/mode/php/php.js
+++ b/js/codemirror-5.39.0/mode/php/php.js
@@ -151,7 +151,7 @@
};
CodeMirror.defineMode("php", function(config, parserConfig) {
- var htmlMode = CodeMirror.getMode(config, "text/html");
+ var htmlMode = CodeMirror.getMode(config, (parserConfig && parserConfig.htmlMode) || "text/html");
var phpMode = CodeMirror.getMode(config, phpConfig);
function dispatch(stream, state) {
diff --git a/js/codemirror-5.23.0/mode/php/test.js b/js/codemirror-5.39.0/mode/php/test.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/php/test.js
rename to js/codemirror-5.39.0/mode/php/test.js
diff --git a/js/codemirror-5.23.0/mode/pig/index.html b/js/codemirror-5.39.0/mode/pig/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/pig/index.html
rename to js/codemirror-5.39.0/mode/pig/index.html
diff --git a/js/codemirror-5.23.0/mode/pig/pig.js b/js/codemirror-5.39.0/mode/pig/pig.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/pig/pig.js
rename to js/codemirror-5.39.0/mode/pig/pig.js
diff --git a/js/codemirror-5.23.0/mode/powershell/index.html b/js/codemirror-5.39.0/mode/powershell/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/powershell/index.html
rename to js/codemirror-5.39.0/mode/powershell/index.html
diff --git a/js/codemirror-5.23.0/mode/powershell/powershell.js b/js/codemirror-5.39.0/mode/powershell/powershell.js
similarity index 98%
rename from js/codemirror-5.23.0/mode/powershell/powershell.js
rename to js/codemirror-5.39.0/mode/powershell/powershell.js
index c443e72..2728ef9 100644
--- a/js/codemirror-5.23.0/mode/powershell/powershell.js
+++ b/js/codemirror-5.39.0/mode/powershell/powershell.js
@@ -4,9 +4,9 @@
(function(mod) {
'use strict';
if (typeof exports == 'object' && typeof module == 'object') // CommonJS
- mod(require('codemirror'));
+ mod(require('../../lib/codemirror'));
else if (typeof define == 'function' && define.amd) // AMD
- define(['codemirror'], mod);
+ define(['../../lib/codemirror'], mod);
else // Plain browser env
mod(window.CodeMirror);
})(function(CodeMirror) {
@@ -222,6 +222,8 @@ CodeMirror.defineMode('powershell', function() {
state.tokenize = tokenMultiString;
state.startQuote = quoteMatch[0];
return tokenMultiString(stream, state);
+ } else if (stream.eol()) {
+ return 'error';
} else if (stream.peek().match(/[({]/)) {
return 'punctuation';
} else if (stream.peek().match(varNames)) {
diff --git a/js/codemirror-5.23.0/mode/powershell/test.js b/js/codemirror-5.39.0/mode/powershell/test.js
similarity index 94%
rename from js/codemirror-5.23.0/mode/powershell/test.js
rename to js/codemirror-5.39.0/mode/powershell/test.js
index 59b8e6f..9c9aed0 100644
--- a/js/codemirror-5.23.0/mode/powershell/test.js
+++ b/js/codemirror-5.39.0/mode/powershell/test.js
@@ -5,18 +5,20 @@
var mode = CodeMirror.getMode({indentUnit: 2}, "powershell");
function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+ function forEach(arr, f) { for (var i = 0; i < arr.length; i++) f(arr[i], i) }
+
MT('comment', '[number 1][comment # A]');
MT('comment_multiline', '[number 1][comment <#]',
'[comment ABC]',
'[comment #>][number 2]');
- [
+ forEach([
'0', '1234',
'12kb', '12mb', '12Gb', '12Tb', '12PB', '12L', '12D', '12lkb', '12dtb',
'1.234', '1.234e56', '1.', '1.e2', '.2', '.2e34',
'1.2MB', '1.kb', '.1dTB', '1.e1gb', '.2', '.2e34',
'0x1', '0xabcdef', '0x3tb', '0xelmb'
- ].forEach(function(number) {
+ ], function(number) {
MT("number_" + number, "[number " + number + "]");
});
@@ -60,9 +62,9 @@
MT('operator_unary', "[operator +][number 3]");
MT('operator_long', "[operator -match]");
- [
+ forEach([
'(', ')', '[[', ']]', '{', '}', ',', '`', ';', '.'
- ].forEach(function(punctuation) {
+ ], function(punctuation) {
MT("punctuation_" + punctuation.replace(/^[\[\]]/,''), "[punctuation " + punctuation + "]");
});
diff --git a/js/codemirror-5.23.0/mode/properties/index.html b/js/codemirror-5.39.0/mode/properties/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/properties/index.html
rename to js/codemirror-5.39.0/mode/properties/index.html
diff --git a/js/codemirror-5.23.0/mode/properties/properties.js b/js/codemirror-5.39.0/mode/properties/properties.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/properties/properties.js
rename to js/codemirror-5.39.0/mode/properties/properties.js
diff --git a/js/codemirror-5.23.0/mode/protobuf/index.html b/js/codemirror-5.39.0/mode/protobuf/index.html
similarity index 63%
rename from js/codemirror-5.23.0/mode/protobuf/index.html
rename to js/codemirror-5.39.0/mode/protobuf/index.html
index cfe7b9d..55d4535 100644
--- a/js/codemirror-5.23.0/mode/protobuf/index.html
+++ b/js/codemirror-5.39.0/mode/protobuf/index.html
@@ -54,9 +54,49 @@
ProtoBuf mode
required bool deleted = 11 [default = false];
}
-
+
+
+syntax = "proto3";
+package tutorial;
+
+import "google/protobuf/timestamp.proto";
+option java_package = "com.example.tutorial";
+option java_outer_classname = "AddressBookProtos";
+option csharp_namespace = "Google.Protobuf.Examples.AddressBook";
+
+message Person {
+ string name = 1;
+ int32 id = 2; // Unique ID number for this person.
+ string email = 3;
+
+ enum PhoneType {
+ MOBILE = 0;
+ HOME = 1;
+ WORK = 2;
+ }
+
+ message PhoneNumber {
+ string number = 1;
+ PhoneType type = 2;
+ }
+
+ repeated PhoneNumber phones = 4;
+
+ google.protobuf.Timestamp last_updated = 5;
+}
+
+// Our address book file is just one of these.
+message AddressBook {
+ repeated Person people = 1;
+}
+service Test {
+ rpc SayHello (HelloRequest) returns (HelloReply) {}
+ rpc SayHelloAgain (HelloRequest) returns (HelloReply) {}
+}
+
MIME types defined: text/x-protobuf.
diff --git a/js/codemirror-5.23.0/mode/protobuf/protobuf.js b/js/codemirror-5.39.0/mode/protobuf/protobuf.js
similarity index 96%
rename from js/codemirror-5.23.0/mode/protobuf/protobuf.js
rename to js/codemirror-5.39.0/mode/protobuf/protobuf.js
index bcae276..93cb3b0 100644
--- a/js/codemirror-5.23.0/mode/protobuf/protobuf.js
+++ b/js/codemirror-5.39.0/mode/protobuf/protobuf.js
@@ -19,7 +19,8 @@
"package", "message", "import", "syntax",
"required", "optional", "repeated", "reserved", "default", "extensions", "packed",
"bool", "bytes", "double", "enum", "float", "string",
- "int32", "int64", "uint32", "uint64", "sint32", "sint64", "fixed32", "fixed64", "sfixed32", "sfixed64"
+ "int32", "int64", "uint32", "uint64", "sint32", "sint64", "fixed32", "fixed64", "sfixed32", "sfixed64",
+ "option", "service", "rpc", "returns"
];
var keywords = wordRegexp(keywordArray);
diff --git a/js/codemirror-5.23.0/mode/pug/index.html b/js/codemirror-5.39.0/mode/pug/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/pug/index.html
rename to js/codemirror-5.39.0/mode/pug/index.html
diff --git a/js/codemirror-5.23.0/mode/pug/pug.js b/js/codemirror-5.39.0/mode/pug/pug.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/pug/pug.js
rename to js/codemirror-5.39.0/mode/pug/pug.js
diff --git a/js/codemirror-5.23.0/mode/puppet/index.html b/js/codemirror-5.39.0/mode/puppet/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/puppet/index.html
rename to js/codemirror-5.39.0/mode/puppet/index.html
diff --git a/js/codemirror-5.23.0/mode/puppet/puppet.js b/js/codemirror-5.39.0/mode/puppet/puppet.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/puppet/puppet.js
rename to js/codemirror-5.39.0/mode/puppet/puppet.js
diff --git a/js/codemirror-5.23.0/mode/python/index.html b/js/codemirror-5.39.0/mode/python/index.html
similarity index 94%
rename from js/codemirror-5.23.0/mode/python/index.html
rename to js/codemirror-5.39.0/mode/python/index.html
index 0ac02a3..134387f 100644
--- a/js/codemirror-5.23.0/mode/python/index.html
+++ b/js/codemirror-5.39.0/mode/python/index.html
@@ -126,6 +126,15 @@
Python mode
def __init__(self, mixin = 'Hello'):
self.mixin = mixin
+# Python 3.6 f-strings (https://www.python.org/dev/peps/pep-0498/)
+f'My name is {name}, my age next year is {age+1}, my anniversary is {anniversary:%A, %B %d, %Y}.'
+f'He said his name is {name!r}.'
+f"""He said his name is {name!r}."""
+f'{"quoted string"}'
+f'{{ {4*10} }}'
+f'This is an error }'
+f'This is ok }}'
+fr'x={4*10}\n'
diff --git a/js/codemirror-5.23.0/mode/python/python.js b/js/codemirror-5.39.0/mode/python/python.js
similarity index 69%
rename from js/codemirror-5.23.0/mode/python/python.js
rename to js/codemirror-5.39.0/mode/python/python.js
index 4310f9f..a13a850 100644
--- a/js/codemirror-5.23.0/mode/python/python.js
+++ b/js/codemirror-5.39.0/mode/python/python.js
@@ -41,10 +41,11 @@
CodeMirror.defineMode("python", function(conf, parserConf) {
var ERRORCLASS = "error";
- var singleDelimiters = parserConf.singleDelimiters || /^[\(\)\[\]\{\}@,:`=;\.]/;
- var doubleOperators = parserConf.doubleOperators || /^([!<>]==|<>|<<|>>|\/\/|\*\*)/;
- var doubleDelimiters = parserConf.doubleDelimiters || /^(\+=|\-=|\*=|%=|\/=|&=|\|=|\^=)/;
- var tripleDelimiters = parserConf.tripleDelimiters || /^(\/\/=|>>=|<<=|\*\*=)/;
+ var delimiters = parserConf.delimiters || parserConf.singleDelimiters || /^[\(\)\[\]\{\}@,:`=;\.\\]/;
+ // (Backwards-compatiblity with old, cumbersome config system)
+ var operators = [parserConf.singleOperators, parserConf.doubleOperators, parserConf.doubleDelimiters, parserConf.tripleDelimiters,
+ parserConf.operators || /^([-+*/%\/&|^]=?|[<>=]+|\/\/=?|\*\*=?|!=|[~!@])/]
+ for (var i = 0; i < operators.length; i++) if (!operators[i]) operators.splice(i--, 1)
var hangingIndent = parserConf.hangingIndent || conf.indentUnit;
@@ -58,13 +59,11 @@
var py3 = !(parserConf.version && Number(parserConf.version) < 3)
if (py3) {
// since http://legacy.python.org/dev/peps/pep-0465/ @ is also an operator
- var singleOperators = parserConf.singleOperators || /^[\+\-\*\/%&|\^~<>!@]/;
var identifiers = parserConf.identifiers|| /^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*/;
myKeywords = myKeywords.concat(["nonlocal", "False", "True", "None", "async", "await"]);
myBuiltins = myBuiltins.concat(["ascii", "bytes", "exec", "print"]);
- var stringPrefixes = new RegExp("^(([rbuf]|(br))?('{3}|\"{3}|['\"]))", "i");
+ var stringPrefixes = new RegExp("^(([rbuf]|(br)|(fr))?('{3}|\"{3}|['\"]))", "i");
} else {
- var singleOperators = parserConf.singleOperators || /^[\+\-\*\/%&|\^~<>!]/;
var identifiers = parserConf.identifiers|| /^[_A-Za-z][_A-Za-z0-9]*/;
myKeywords = myKeywords.concat(["exec", "print"]);
myBuiltins = myBuiltins.concat(["apply", "basestring", "buffer", "cmp", "coerce", "execfile",
@@ -77,9 +76,10 @@
// tokenizers
function tokenBase(stream, state) {
- if (stream.sol()) state.indent = stream.indentation()
+ var sol = stream.sol() && state.lastToken != "\\"
+ if (sol) state.indent = stream.indentation()
// Handle scope changes
- if (stream.sol() && top(state).type == "py") {
+ if (sol && top(state).type == "py") {
var scopeOffset = top(state).offset;
if (stream.eatSpace()) {
var lineOffset = stream.indentation();
@@ -101,20 +101,15 @@
function tokenBaseInner(stream, state) {
if (stream.eatSpace()) return null;
- var ch = stream.peek();
-
// Handle Comments
- if (ch == "#") {
- stream.skipToEnd();
- return "comment";
- }
+ if (stream.match(/^#.*/)) 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_]*\.\d+(e[\+\-]?\d+)?/i)) { floatLiteral = true; }
+ if (stream.match(/^[\d_]+\.\d*/)) { floatLiteral = true; }
if (stream.match(/^\.\d+/)) { floatLiteral = true; }
if (floatLiteral) {
// Float literals may be "imaginary"
@@ -124,13 +119,13 @@
// Integers
var intLiteral = false;
// Hex
- if (stream.match(/^0x[0-9a-f]+/i)) intLiteral = true;
+ if (stream.match(/^0x[0-9a-f_]+/i)) intLiteral = true;
// Binary
- if (stream.match(/^0b[01]+/i)) intLiteral = true;
+ if (stream.match(/^0b[01_]+/i)) intLiteral = true;
// Octal
- if (stream.match(/^0o[0-7]+/i)) intLiteral = true;
+ if (stream.match(/^0o[0-7_]+/i)) intLiteral = true;
// Decimal
- if (stream.match(/^[1-9]\d*(e[\+\-]?\d+)?/)) {
+ if (stream.match(/^[1-9][\d_]*(e[\+\-]?[\d_]+)?/)) {
// Decimal literals may be "imaginary"
stream.eat(/J/i);
// TODO - Can you have imaginary longs?
@@ -147,19 +142,20 @@
// Handle Strings
if (stream.match(stringPrefixes)) {
- state.tokenize = tokenStringFactory(stream.current());
- return state.tokenize(stream, state);
+ var isFmtString = stream.current().toLowerCase().indexOf('f') !== -1;
+ if (!isFmtString) {
+ state.tokenize = tokenStringFactory(stream.current());
+ return state.tokenize(stream, state);
+ } else {
+ state.tokenize = formatStringFactory(stream.current(), state.tokenize);
+ return state.tokenize(stream, state);
+ }
}
- // Handle operators and Delimiters
- if (stream.match(tripleDelimiters) || stream.match(doubleDelimiters))
- return "punctuation";
-
- if (stream.match(doubleOperators) || stream.match(singleOperators))
- return "operator";
+ for (var i = 0; i < operators.length; i++)
+ if (stream.match(operators[i])) return "operator"
- if (stream.match(singleDelimiters))
- return "punctuation";
+ if (stream.match(delimiters)) return "punctuation";
if (state.lastToken == "." && stream.match(identifiers))
return "property";
@@ -184,6 +180,77 @@
return ERRORCLASS;
}
+ function formatStringFactory(delimiter, tokenOuter) {
+ while ("rubf".indexOf(delimiter.charAt(0).toLowerCase()) >= 0)
+ delimiter = delimiter.substr(1);
+
+ var singleline = delimiter.length == 1;
+ var OUTCLASS = "string";
+
+ function tokenFString(stream, state) {
+ // inside f-str Expression
+ if (stream.match(delimiter)) {
+ // expression ends pre-maturally, but very common in editing
+ // Could show error to remind users to close brace here
+ state.tokenize = tokenString
+ return OUTCLASS;
+ } else if (stream.match('{')) {
+ // starting brace, if not eaten below
+ return "punctuation";
+ } else if (stream.match('}')) {
+ // return to regular inside string state
+ state.tokenize = tokenString
+ return "punctuation";
+ } else {
+ // use tokenBaseInner to parse the expression
+ return tokenBaseInner(stream, state);
+ }
+ }
+
+ function tokenString(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 = tokenOuter;
+ return OUTCLASS;
+ } else if (stream.match('{{')) {
+ // ignore {{ in f-str
+ return OUTCLASS;
+ } else if (stream.match('{', false)) {
+ // switch to nested mode
+ state.tokenize = tokenFString
+ if (stream.current()) {
+ return OUTCLASS;
+ } else {
+ // need to return something, so eat the starting {
+ stream.next();
+ return "punctuation";
+ }
+ } else if (stream.match('}}')) {
+ return OUTCLASS;
+ } else if (stream.match('}')) {
+ // single } in f-string is an error
+ return ERRORCLASS;
+ } else {
+ stream.eat(/['"]/);
+ }
+ }
+ if (singleline) {
+ if (parserConf.singleLineStringErrors)
+ return ERRORCLASS;
+ else
+ state.tokenize = tokenOuter;
+ }
+ return OUTCLASS;
+ }
+ tokenString.isString = true;
+ return tokenString;
+ }
+
function tokenStringFactory(delimiter) {
while ("rubf".indexOf(delimiter.charAt(0).toLowerCase()) >= 0)
delimiter = delimiter.substr(1);
@@ -264,14 +331,16 @@
if (current == ":" && !state.lambda && top(state).type == "py")
pushPyScope(state);
- var delimiter_index = current.length == 1 ? "[({".indexOf(current) : -1;
- if (delimiter_index != -1)
- pushBracketScope(stream, state, "])}".slice(delimiter_index, delimiter_index+1));
+ if (current.length == 1 && !/string|comment/.test(style)) {
+ var delimiter_index = "[({".indexOf(current);
+ if (delimiter_index != -1)
+ pushBracketScope(stream, state, "])}".slice(delimiter_index, delimiter_index+1));
- delimiter_index = "])}".indexOf(current);
- if (delimiter_index != -1) {
- if (top(state).type == current) state.indent = state.scopes.pop().offset - hangingIndent
- else return ERRORCLASS;
+ delimiter_index = "])}".indexOf(current);
+ if (delimiter_index != -1) {
+ if (top(state).type == current) state.indent = state.scopes.pop().offset - hangingIndent
+ else return ERRORCLASS;
+ }
}
if (state.dedent > 0 && stream.eol() && top(state).type == "py") {
if (state.scopes.length > 1) state.scopes.pop();
@@ -332,8 +401,8 @@
CodeMirror.defineMIME("text/x-cython", {
name: "python",
- extra_keywords: words("by cdef cimport cpdef ctypedef enum except"+
- "extern gil include nogil property public"+
+ extra_keywords: words("by cdef cimport cpdef ctypedef enum except "+
+ "extern gil include nogil property public "+
"readonly struct union DEF IF ELIF ELSE")
});
diff --git a/js/codemirror-5.23.0/mode/python/test.js b/js/codemirror-5.39.0/mode/python/test.js
similarity index 63%
rename from js/codemirror-5.23.0/mode/python/test.js
rename to js/codemirror-5.39.0/mode/python/test.js
index c1a9c6a..40f0a61 100644
--- a/js/codemirror-5.23.0/mode/python/test.js
+++ b/js/codemirror-5.39.0/mode/python/test.js
@@ -24,7 +24,15 @@
MT("matmulWithSpace:", "[variable a] [operator @] [variable b]");
MT("matmulWithoutSpace:", "[variable a][operator @][variable b]");
MT("matmulSpaceBefore:", "[variable a] [operator @][variable b]");
+ var before_equal_sign = ["+", "-", "*", "/", "=", "!", ">", "<"];
+ for (var i = 0; i < before_equal_sign.length; ++i) {
+ var c = before_equal_sign[i]
+ MT("before_equal_sign_" + c, "[variable a] [operator " + c + "=] [variable b]");
+ }
- MT("fValidStringPrefix", "[string f'this is a {formatted} string']");
+ MT("fValidStringPrefix", "[string f'this is a]{[variable formatted]}[string string']");
+ MT("fValidExpressioninFString", "[string f'expression ]{[number 100][operator *][number 5]}[string string']");
+ MT("fInvalidFString", "[error f'this is wrong}]");
+ MT("fNestedFString", "[string f'expression ]{[number 100] [operator +] [string f'inner]{[number 5]}[string ']}[string string']");
MT("uValidStringPrefix", "[string u'this is an unicode string']");
})();
diff --git a/js/codemirror-5.23.0/mode/q/index.html b/js/codemirror-5.39.0/mode/q/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/q/index.html
rename to js/codemirror-5.39.0/mode/q/index.html
diff --git a/js/codemirror-5.23.0/mode/q/q.js b/js/codemirror-5.39.0/mode/q/q.js
similarity index 92%
rename from js/codemirror-5.23.0/mode/q/q.js
rename to js/codemirror-5.39.0/mode/q/q.js
index a4af938..9aee18a 100644
--- a/js/codemirror-5.23.0/mode/q/q.js
+++ b/js/codemirror-5.39.0/mode/q/q.js
@@ -25,7 +25,7 @@ CodeMirror.defineMode("q",function(config){
return(state.tokenize=tokenLineComment)(stream,state);
else if(c=="\\"){
if(stream.eol()||/\s/.test(stream.peek()))
- return stream.skipToEnd(),/^\\\s*$/.test(stream.current())?(state.tokenize=tokenCommentToEOF)(stream, state):state.tokenize=tokenBase,"comment";
+ return stream.skipToEnd(),/^\\\s*$/.test(stream.current())?(state.tokenize=tokenCommentToEOF)(stream):state.tokenize=tokenBase,"comment";
else
return state.tokenize=tokenBase,"builtin";
}
@@ -34,25 +34,25 @@ CodeMirror.defineMode("q",function(config){
if(c=='"')
return(state.tokenize=tokenString)(stream,state);
if(c=='`')
- return stream.eatWhile(/[A-Z|a-z|\d|_|:|\/|\.]/),"symbol";
+ return stream.eatWhile(/[A-Za-z\d_:\/.]/),"symbol";
if(("."==c&&/\d/.test(stream.peek()))||/\d/.test(c)){
var t=null;
stream.backUp(1);
- if(stream.match(/^\d{4}\.\d{2}(m|\.\d{2}([D|T](\d{2}(:\d{2}(:\d{2}(\.\d{1,9})?)?)?)?)?)/)
+ if(stream.match(/^\d{4}\.\d{2}(m|\.\d{2}([DT](\d{2}(:\d{2}(:\d{2}(\.\d{1,9})?)?)?)?)?)/)
|| stream.match(/^\d+D(\d{2}(:\d{2}(:\d{2}(\.\d{1,9})?)?)?)/)
|| stream.match(/^\d{2}:\d{2}(:\d{2}(\.\d{1,9})?)?/)
|| stream.match(/^\d+[ptuv]{1}/))
t="temporal";
else if(stream.match(/^0[NwW]{1}/)
- || stream.match(/^0x[\d|a-f|A-F]*/)
- || stream.match(/^[0|1]+[b]{1}/)
+ || stream.match(/^0x[\da-fA-F]*/)
+ || stream.match(/^[01]+[b]{1}/)
|| stream.match(/^\d+[chijn]{1}/)
|| stream.match(/-?\d*(\.\d*)?(e[+\-]?\d+)?(e|f)?/))
t="number";
return(t&&(!(c=stream.peek())||E.test(c)))?t:(stream.next(),"error");
}
- if(/[A-Z|a-z]|\./.test(c))
- return stream.eatWhile(/[A-Z|a-z|\.|_|\d]/),keywords.test(stream.current())?"keyword":"variable";
+ if(/[A-Za-z]|\./.test(c))
+ return stream.eatWhile(/[A-Za-z._\d]/),keywords.test(stream.current())?"keyword":"variable";
if(/[|/&^!+:\\\-*%$=~#;@><\.,?_\']/.test(c))
return null;
if(/[{}\(\[\]\)]/.test(c))
diff --git a/js/codemirror-5.23.0/mode/r/index.html b/js/codemirror-5.39.0/mode/r/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/r/index.html
rename to js/codemirror-5.39.0/mode/r/index.html
diff --git a/js/codemirror-5.23.0/mode/r/r.js b/js/codemirror-5.39.0/mode/r/r.js
similarity index 86%
rename from js/codemirror-5.23.0/mode/r/r.js
rename to js/codemirror-5.39.0/mode/r/r.js
index 7e15bea..be7db46 100644
--- a/js/codemirror-5.23.0/mode/r/r.js
+++ b/js/codemirror-5.39.0/mode/r/r.js
@@ -108,13 +108,23 @@ CodeMirror.defineMode("r", function(config) {
};
}
+ var ALIGN_YES = 1, ALIGN_NO = 2, BRACELESS = 4
+
function push(state, type, stream) {
state.ctx = {type: type,
indent: state.indent,
- align: null,
+ flags: 0,
column: stream.column(),
prev: state.ctx};
}
+ function setFlag(state, flag) {
+ var ctx = state.ctx
+ state.ctx = {type: ctx.type,
+ indent: ctx.indent,
+ flags: ctx.flags | flag,
+ column: ctx.column,
+ prev: ctx.prev}
+ }
function pop(state) {
state.indent = state.ctx.indent;
state.ctx = state.ctx.prev;
@@ -125,22 +135,22 @@ CodeMirror.defineMode("r", function(config) {
return {tokenize: tokenBase,
ctx: {type: "top",
indent: -config.indentUnit,
- align: false},
+ flags: ALIGN_NO},
indent: 0,
afterIdent: false};
},
token: function(stream, state) {
if (stream.sol()) {
- if (state.ctx.align == null) state.ctx.align = false;
+ if ((state.ctx.flags & 3) == 0) state.ctx.flags |= ALIGN_NO
+ if (state.ctx.flags & BRACELESS) pop(state)
state.indent = stream.indentation();
}
if (stream.eatSpace()) return null;
var style = state.tokenize(stream, state);
- if (style != "comment" && state.ctx.align == null) state.ctx.align = true;
+ if (style != "comment" && (state.ctx.flags & ALIGN_NO) == 0) setFlag(state, ALIGN_YES)
- var ctype = state.ctx.type;
- if ((curPunc == ";" || curPunc == "{" || curPunc == "}") && ctype == "block") pop(state);
+ if ((curPunc == ";" || curPunc == "{" || curPunc == "}") && state.ctx.type == "block") pop(state);
if (curPunc == "{") push(state, "}", stream);
else if (curPunc == "(") {
push(state, ")", stream);
@@ -148,7 +158,8 @@ CodeMirror.defineMode("r", function(config) {
}
else if (curPunc == "[") push(state, "]", stream);
else if (curPunc == "block") push(state, "block", stream);
- else if (curPunc == ctype) pop(state);
+ else if (curPunc == state.ctx.type) pop(state);
+ else if (state.ctx.type == "block" && style != "comment") setFlag(state, BRACELESS)
state.afterIdent = style == "variable" || style == "keyword";
return style;
},
@@ -157,8 +168,9 @@ CodeMirror.defineMode("r", function(config) {
if (state.tokenize != tokenBase) return 0;
var firstChar = textAfter && textAfter.charAt(0), ctx = state.ctx,
closing = firstChar == ctx.type;
+ if (ctx.flags & BRACELESS) ctx = ctx.prev
if (ctx.type == "block") return ctx.indent + (firstChar == "{" ? 0 : config.indentUnit);
- else if (ctx.align) return ctx.column + (closing ? 0 : 1);
+ else if (ctx.flags & ALIGN_YES) return ctx.column + (closing ? 0 : 1);
else return ctx.indent + (closing ? 0 : config.indentUnit);
},
diff --git a/js/codemirror-5.23.0/mode/rpm/changes/index.html b/js/codemirror-5.39.0/mode/rpm/changes/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/rpm/changes/index.html
rename to js/codemirror-5.39.0/mode/rpm/changes/index.html
diff --git a/js/codemirror-5.23.0/mode/rpm/index.html b/js/codemirror-5.39.0/mode/rpm/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/rpm/index.html
rename to js/codemirror-5.39.0/mode/rpm/index.html
diff --git a/js/codemirror-5.23.0/mode/rpm/rpm.js b/js/codemirror-5.39.0/mode/rpm/rpm.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/rpm/rpm.js
rename to js/codemirror-5.39.0/mode/rpm/rpm.js
diff --git a/js/codemirror-5.23.0/mode/rst/index.html b/js/codemirror-5.39.0/mode/rst/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/rst/index.html
rename to js/codemirror-5.39.0/mode/rst/index.html
diff --git a/js/codemirror-5.23.0/mode/rst/rst.js b/js/codemirror-5.39.0/mode/rst/rst.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/rst/rst.js
rename to js/codemirror-5.39.0/mode/rst/rst.js
diff --git a/js/codemirror-5.23.0/mode/ruby/index.html b/js/codemirror-5.39.0/mode/ruby/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/ruby/index.html
rename to js/codemirror-5.39.0/mode/ruby/index.html
diff --git a/js/codemirror-5.23.0/mode/ruby/ruby.js b/js/codemirror-5.39.0/mode/ruby/ruby.js
similarity index 93%
rename from js/codemirror-5.23.0/mode/ruby/ruby.js
rename to js/codemirror-5.39.0/mode/ruby/ruby.js
index 085f909..874c183 100644
--- a/js/codemirror-5.23.0/mode/ruby/ruby.js
+++ b/js/codemirror-5.39.0/mode/ruby/ruby.js
@@ -46,22 +46,10 @@ CodeMirror.defineMode("ruby", function(config) {
if (ch == "`" || ch == "'" || ch == '"') {
return chain(readQuoted(ch, "string", ch == '"' || ch == "`"), stream, state);
} else if (ch == "/") {
- var currentIndex = stream.current().length;
- if (stream.skipTo("/")) {
- var search_till = stream.current().length;
- stream.backUp(stream.current().length - currentIndex);
- var balance = 0; // balance brackets
- while (stream.current().length < search_till) {
- var chchr = stream.next();
- if (chchr == "(") balance += 1;
- else if (chchr == ")") balance -= 1;
- if (balance < 0) break;
- }
- stream.backUp(stream.current().length - currentIndex);
- if (balance == 0)
- return chain(readQuoted(ch, "string-2", true), stream, state);
- }
- return "operator";
+ if (regexpAhead(stream))
+ return chain(readQuoted(ch, "string-2", true), stream, state);
+ else
+ return "operator";
} else if (ch == "%") {
var style = "string", embed = true;
if (stream.eat("s")) style = "atom";
@@ -148,6 +136,28 @@ CodeMirror.defineMode("ruby", function(config) {
}
}
+ function regexpAhead(stream) {
+ var start = stream.pos, depth = 0, next, found = false, escaped = false
+ while ((next = stream.next()) != null) {
+ if (!escaped) {
+ if ("[{(".indexOf(next) > -1) {
+ depth++
+ } else if ("]})".indexOf(next) > -1) {
+ depth--
+ if (depth < 0) break
+ } else if (next == "/" && depth == 0) {
+ found = true
+ break
+ }
+ escaped = next == "\\"
+ } else {
+ escaped = false
+ }
+ }
+ stream.backUp(stream.pos - start)
+ return found
+ }
+
function tokenBaseUntilBrace(depth) {
if (!depth) depth = 1;
return function(stream, state) {
@@ -276,7 +286,8 @@ CodeMirror.defineMode("ruby", function(config) {
},
electricInput: /^\s*(?:end|rescue|elsif|else|\})$/,
- lineComment: "#"
+ lineComment: "#",
+ fold: "indent"
};
});
diff --git a/js/codemirror-5.23.0/mode/ruby/test.js b/js/codemirror-5.39.0/mode/ruby/test.js
similarity index 69%
rename from js/codemirror-5.23.0/mode/ruby/test.js
rename to js/codemirror-5.39.0/mode/ruby/test.js
index cade864..3133bd6 100644
--- a/js/codemirror-5.23.0/mode/ruby/test.js
+++ b/js/codemirror-5.39.0/mode/ruby/test.js
@@ -11,4 +11,6 @@
MT("divide_equal_operator_no_spacing",
"[variable foo][operator /=][number 42]");
+ MT("complex_regexp",
+ "[keyword if] [variable cr] [operator =~] [string-2 /(?: \\( #{][tag RE_NOT][string-2 }\\( | #{][tag RE_NOT_PAR_OR][string-2 }* #{][tag RE_OPA_OR][string-2 } )/][variable x]")
})();
diff --git a/js/codemirror-5.23.0/mode/rust/index.html b/js/codemirror-5.39.0/mode/rust/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/rust/index.html
rename to js/codemirror-5.39.0/mode/rust/index.html
diff --git a/js/codemirror-5.23.0/mode/rust/rust.js b/js/codemirror-5.39.0/mode/rust/rust.js
similarity index 98%
rename from js/codemirror-5.23.0/mode/rust/rust.js
rename to js/codemirror-5.39.0/mode/rust/rust.js
index 8558b53..b635563 100644
--- a/js/codemirror-5.23.0/mode/rust/rust.js
+++ b/js/codemirror-5.39.0/mode/rust/rust.js
@@ -68,4 +68,5 @@ CodeMirror.defineSimpleMode("rust",{
CodeMirror.defineMIME("text/x-rustsrc", "rust");
+CodeMirror.defineMIME("text/rust", "rust");
});
diff --git a/js/codemirror-5.23.0/mode/rust/test.js b/js/codemirror-5.39.0/mode/rust/test.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/rust/test.js
rename to js/codemirror-5.39.0/mode/rust/test.js
diff --git a/js/codemirror-5.23.0/mode/sas/index.html b/js/codemirror-5.39.0/mode/sas/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/sas/index.html
rename to js/codemirror-5.39.0/mode/sas/index.html
diff --git a/js/codemirror-5.23.0/mode/sas/sas.js b/js/codemirror-5.39.0/mode/sas/sas.js
old mode 100755
new mode 100644
similarity index 94%
rename from js/codemirror-5.23.0/mode/sas/sas.js
rename to js/codemirror-5.39.0/mode/sas/sas.js
index a6109eb..d85b335
--- a/js/codemirror-5.23.0/mode/sas/sas.js
+++ b/js/codemirror-5.39.0/mode/sas/sas.js
@@ -11,7 +11,7 @@
//Definitions
-// comment -- text withing * ; or /* */
+// comment -- text within * ; or /* */
// keyword -- SAS language variable
// variable -- macro variables starts with '&' or variable formats
// variable-2 -- DATA Step, proc, or macro names
@@ -116,28 +116,15 @@
return "comment";
}
+ if (ch == "*" && stream.column() == stream.indentation()) {
+ stream.skipToEnd()
+ return "comment"
+ }
+
// DoubleOperator match
var doubleOperator = ch + stream.peek();
- // Match all line comments.
- var myString = stream.string;
- var myRegexp = /(?:^\s*|[;]\s*)(\*.*?);/ig;
- var match = myRegexp.exec(myString);
- if (match !== null) {
- if (match.index === 0 && (stream.column() !== (match.index + match[0].length - 1))) {
- stream.backUp(stream.column());
- stream.skipTo(';');
- stream.next();
- return 'comment';
- } else if (match.index + 1 < stream.column() && stream.column() < match.index + match[0].length - 1) {
- // the ';' triggers the match so move one past it to start
- // the comment block that is why match.index+1
- stream.backUp(stream.column() - match.index - 1);
- stream.skipTo(';');
- stream.next();
- return 'comment';
- }
- } else if ((ch === '"' || ch === "'") && !state.continueString) {
+ if ((ch === '"' || ch === "'") && !state.continueString) {
state.continueString = ch
return "string"
} else if (state.continueString) {
diff --git a/js/codemirror-5.23.0/mode/sass/index.html b/js/codemirror-5.39.0/mode/sass/index.html
similarity index 94%
rename from js/codemirror-5.23.0/mode/sass/index.html
rename to js/codemirror-5.39.0/mode/sass/index.html
index 9f4a790..6305649 100644
--- a/js/codemirror-5.23.0/mode/sass/index.html
+++ b/js/codemirror-5.39.0/mode/sass/index.html
@@ -7,6 +7,7 @@
+
@@ -58,7 +59,8 @@
Sass mode
diff --git a/js/codemirror-5.23.0/mode/sass/sass.js b/js/codemirror-5.39.0/mode/sass/sass.js
similarity index 81%
rename from js/codemirror-5.23.0/mode/sass/sass.js
rename to js/codemirror-5.39.0/mode/sass/sass.js
index 6973ece..7d8135b 100644
--- a/js/codemirror-5.23.0/mode/sass/sass.js
+++ b/js/codemirror-5.39.0/mode/sass/sass.js
@@ -3,15 +3,21 @@
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
- mod(require("../../lib/codemirror"));
+ mod(require("../../lib/codemirror"), require("../css/css"));
else if (typeof define == "function" && define.amd) // AMD
- define(["../../lib/codemirror"], mod);
+ define(["../../lib/codemirror", "../css/css"], mod);
else // Plain browser env
mod(CodeMirror);
})(function(CodeMirror) {
"use strict";
CodeMirror.defineMode("sass", function(config) {
+ var cssMode = CodeMirror.mimeModes["text/css"];
+ var propertyKeywords = cssMode.propertyKeywords || {},
+ colorKeywords = cssMode.colorKeywords || {},
+ valueKeywords = cssMode.valueKeywords || {},
+ fontProperties = cssMode.fontProperties || {};
+
function tokenRegexp(words) {
return new RegExp("^" + words.join("|"));
}
@@ -25,6 +31,12 @@ CodeMirror.defineMode("sass", function(config) {
var pseudoElementsRegexp = /^::?[a-zA-Z_][\w\-]*/;
+ var word;
+
+ function isEndLine(stream) {
+ return !stream.peek() || stream.match(/\s+$/, false);
+ }
+
function urlTokens(stream, state) {
var ch = stream.peek();
@@ -76,6 +88,9 @@ CodeMirror.defineMode("sass", function(config) {
if (endingString) {
if (nextChar !== quote && greedy) { stream.next(); }
+ if (isEndLine(stream)) {
+ state.cursorHalf = 0;
+ }
state.tokenizer = tokenBase;
return "string";
} else if (nextChar === "#" && peekChar === "{") {
@@ -147,14 +162,20 @@ CodeMirror.defineMode("sass", function(config) {
// first half i.e. before : for key-value pairs
// including selectors
+ if (ch === "-") {
+ if (stream.match(/^-\w+-/)) {
+ return "meta";
+ }
+ }
+
if (ch === ".") {
stream.next();
if (stream.match(/^[\w-]+/)) {
indent(state);
- return "atom";
+ return "qualifier";
} else if (stream.peek() === "#") {
indent(state);
- return "atom";
+ return "tag";
}
}
@@ -163,11 +184,11 @@ CodeMirror.defineMode("sass", function(config) {
// ID selectors
if (stream.match(/^[\w-]+/)) {
indent(state);
- return "atom";
+ return "builtin";
}
if (stream.peek() === "#") {
indent(state);
- return "atom";
+ return "tag";
}
}
@@ -220,37 +241,48 @@ CodeMirror.defineMode("sass", function(config) {
// Indent Directives
if (stream.match(/^@(else if|if|media|else|for|each|while|mixin|function)/)) {
indent(state);
- return "meta";
+ return "def";
}
// Other Directives
if (ch === "@") {
stream.next();
stream.eatWhile(/[\w-]/);
- return "meta";
+ return "def";
}
if (stream.eatWhile(/[\w-]/)){
if(stream.match(/ *: *[\w-\+\$#!\("']/,false)){
- return "property";
+ word = stream.current().toLowerCase();
+ var prop = state.prevProp + "-" + word;
+ if (propertyKeywords.hasOwnProperty(prop)) {
+ return "property";
+ } else if (propertyKeywords.hasOwnProperty(word)) {
+ state.prevProp = word;
+ return "property";
+ } else if (fontProperties.hasOwnProperty(word)) {
+ return "property";
+ }
+ return "tag";
}
else if(stream.match(/ *:/,false)){
indent(state);
state.cursorHalf = 1;
- return "atom";
+ state.prevProp = stream.current().toLowerCase();
+ return "property";
}
else if(stream.match(/ *,/,false)){
- return "atom";
+ return "tag";
}
else{
indent(state);
- return "atom";
+ return "tag";
}
}
if(ch === ":"){
if (stream.match(pseudoElementsRegexp)){ // could be a pseudo-element
- return "keyword";
+ return "variable-3";
}
stream.next();
state.cursorHalf=1;
@@ -264,7 +296,7 @@ CodeMirror.defineMode("sass", function(config) {
stream.next();
// Hex numbers
if (stream.match(/[0-9a-fA-F]{6}|[0-9a-fA-F]{3}/)){
- if(!stream.peek()){
+ if (isEndLine(stream)) {
state.cursorHalf = 0;
}
return "number";
@@ -273,7 +305,7 @@ CodeMirror.defineMode("sass", function(config) {
// Numbers
if (stream.match(/^-?[0-9\.]+/)){
- if(!stream.peek()){
+ if (isEndLine(stream)) {
state.cursorHalf = 0;
}
return "number";
@@ -281,14 +313,14 @@ CodeMirror.defineMode("sass", function(config) {
// Units
if (stream.match(/^(px|em|in)\b/)){
- if(!stream.peek()){
+ if (isEndLine(stream)) {
state.cursorHalf = 0;
}
return "unit";
}
if (stream.match(keywordsRegexp)){
- if(!stream.peek()){
+ if (isEndLine(stream)) {
state.cursorHalf = 0;
}
return "keyword";
@@ -296,7 +328,7 @@ CodeMirror.defineMode("sass", function(config) {
if (stream.match(/^url/) && stream.peek() === "(") {
state.tokenizer = urlTokens;
- if(!stream.peek()){
+ if (isEndLine(stream)) {
state.cursorHalf = 0;
}
return "atom";
@@ -306,23 +338,21 @@ CodeMirror.defineMode("sass", function(config) {
if (ch === "$") {
stream.next();
stream.eatWhile(/[\w-]/);
- if(!stream.peek()){
+ if (isEndLine(stream)) {
state.cursorHalf = 0;
}
- return "variable-3";
+ return "variable-2";
}
// bang character for !important, !default, etc.
if (ch === "!") {
stream.next();
- if(!stream.peek()){
- state.cursorHalf = 0;
- }
+ state.cursorHalf = 0;
return stream.match(/^[\w]+/) ? "keyword": "operator";
}
if (stream.match(opRegexp)){
- if(!stream.peek()){
+ if (isEndLine(stream)) {
state.cursorHalf = 0;
}
return "operator";
@@ -330,14 +360,24 @@ CodeMirror.defineMode("sass", function(config) {
// attributes
if (stream.eatWhile(/[\w-]/)) {
- if(!stream.peek()){
+ if (isEndLine(stream)) {
state.cursorHalf = 0;
}
- return "attribute";
+ word = stream.current().toLowerCase();
+ if (valueKeywords.hasOwnProperty(word)) {
+ return "atom";
+ } else if (colorKeywords.hasOwnProperty(word)) {
+ return "keyword";
+ } else if (propertyKeywords.hasOwnProperty(word)) {
+ state.prevProp = stream.current().toLowerCase();
+ return "property";
+ } else {
+ return "tag";
+ }
}
//stream.eatSpace();
- if(!stream.peek()){
+ if (isEndLine(stream)) {
state.cursorHalf = 0;
return null;
}
@@ -407,7 +447,7 @@ CodeMirror.defineMode("sass", function(config) {
return state.scopes[0].offset;
}
};
-});
+}, "css");
CodeMirror.defineMIME("text/x-sass", "sass");
diff --git a/js/codemirror-5.39.0/mode/sass/test.js b/js/codemirror-5.39.0/mode/sass/test.js
new file mode 100644
index 0000000..6b2f593
--- /dev/null
+++ b/js/codemirror-5.39.0/mode/sass/test.js
@@ -0,0 +1,122 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function() {
+ var mode = CodeMirror.getMode({indentUnit: 2}, "sass");
+ // Since Sass has an indent-based syntax, is almost impossible to test correctly the indentation in all cases.
+ // So disable it for tests.
+ mode.indent = undefined;
+ function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+ MT("comment",
+ "[comment // this is a comment]",
+ "[comment also this is a comment]")
+
+ MT("comment_multiline",
+ "[comment /* this is a comment]",
+ "[comment also this is a comment]")
+
+ MT("variable",
+ "[variable-2 $page-width][operator :] [number 800][unit px]")
+
+ MT("global_attributes",
+ "[tag body]",
+ " [property font][operator :]",
+ " [property family][operator :] [atom sans-serif]",
+ " [property size][operator :] [number 30][unit em]",
+ " [property weight][operator :] [atom bold]")
+
+ MT("scoped_styles",
+ "[builtin #contents]",
+ " [property width][operator :] [variable-2 $page-width]",
+ " [builtin #sidebar]",
+ " [property float][operator :] [atom right]",
+ " [property width][operator :] [variable-2 $sidebar-width]",
+ " [builtin #main]",
+ " [property width][operator :] [variable-2 $page-width] [operator -] [variable-2 $sidebar-width]",
+ " [property background][operator :] [variable-2 $primary-color]",
+ " [tag h2]",
+ " [property color][operator :] [keyword blue]")
+
+ // Sass allows to write the colon as first char instead of a "separator".
+ // :color red
+ // Not supported
+ // MT("property_syntax",
+ // "[qualifier .foo]",
+ // " [operator :][property color] [keyword red]")
+
+ MT("import",
+ "[def @import] [string \"sass/variables\"]",
+ // Probably it should parsed as above: as a string even without the " or '
+ // "[def @import] [string sass/baz]"
+ "[def @import] [tag sass][operator /][tag baz]")
+
+ MT("def",
+ "[def @if] [variable-2 $foo] [def @else]")
+
+ MT("tag_on_more_lines",
+ "[tag td],",
+ "[tag th]",
+ " [property font-family][operator :] [string \"Arial\"], [atom serif]")
+
+ MT("important",
+ "[qualifier .foo]",
+ " [property text-decoration][operator :] [atom none] [keyword !important]",
+ "[tag h1]",
+ " [property font-size][operator :] [number 2.5][unit em]")
+
+ MT("selector",
+ // SCSS doesn't highlight the :
+ // "[tag h1]:[variable-3 before],",
+ // "[tag h2]:[variable-3 before]",
+ "[tag h1][variable-3 :before],",
+ "[tag h2][variable-3 :before]",
+ " [property content][operator :] [string \"::\"]")
+
+ MT("definition_mixin_equal",
+ "[variable-2 $defined-bs-type][operator :] [atom border-box] [keyword !default]",
+ "[meta =bs][operator (][variable-2 $bs-type][operator :] [variable-2 $defined-bs-type][operator )]",
+ " [meta -webkit-][property box-sizing][operator :] [variable-2 $bs-type]",
+ " [property box-sizing][operator :] [variable-2 $bs-type]")
+
+ MT("definition_mixin_with_space",
+ "[variable-2 $defined-bs-type][operator :] [atom border-box] [keyword !default]",
+ "[def @mixin] [tag bs][operator (][variable-2 $bs-type][operator :] [variable-2 $defined-bs-type][operator )] ",
+ " [meta -moz-][property box-sizing][operator :] [variable-2 $bs-type]",
+ " [property box-sizing][operator :] [variable-2 $bs-type]")
+
+ MT("numbers_start_dot_include_plus",
+ // The % is not highlighted correctly
+ // "[meta =button-links][operator (][variable-2 $button-base][operator :] [atom darken][operator (][variable-2 $color11], [number 10][unit %][operator )][operator )]",
+ "[meta =button-links][operator (][variable-2 $button-base][operator :] [atom darken][operator (][variable-2 $color11], [number 10][operator %))]",
+ " [property padding][operator :] [number .3][unit em] [number .6][unit em]",
+ " [variable-3 +border-radius][operator (][number 8][unit px][operator )]",
+ " [property background-color][operator :] [variable-2 $button-base]")
+
+ MT("include",
+ "[qualifier .bar]",
+ " [def @include] [tag border-radius][operator (][number 8][unit px][operator )]")
+
+ MT("reference_parent",
+ "[qualifier .col]",
+ " [property clear][operator :] [atom both]",
+ // SCSS doesn't highlight the :
+ // " &:[variable-3 after]",
+ " &[variable-3 :after]",
+ " [property content][operator :] [string '']",
+ " [property clear][operator :] [atom both]")
+
+ MT("reference_parent_with_spaces",
+ "[tag section]",
+ " [property border-left][operator :] [number 20][unit px] [atom transparent] [atom solid] ",
+ " &[qualifier .section3]",
+ " [qualifier .title]",
+ " [property color][operator :] [keyword white] ",
+ " [qualifier .vermas]",
+ " [property display][operator :] [atom none]")
+
+ MT("font_face",
+ "[def @font-face]",
+ " [property font-family][operator :] [string 'icomoon']",
+ " [property src][operator :] [atom url][operator (][string fonts/icomoon.ttf][operator )]")
+})();
diff --git a/js/codemirror-5.23.0/mode/scheme/index.html b/js/codemirror-5.39.0/mode/scheme/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/scheme/index.html
rename to js/codemirror-5.39.0/mode/scheme/index.html
diff --git a/js/codemirror-5.23.0/mode/scheme/scheme.js b/js/codemirror-5.39.0/mode/scheme/scheme.js
similarity index 99%
rename from js/codemirror-5.23.0/mode/scheme/scheme.js
rename to js/codemirror-5.39.0/mode/scheme/scheme.js
index 2234645..1d8f7d1 100644
--- a/js/codemirror-5.23.0/mode/scheme/scheme.js
+++ b/js/codemirror-5.39.0/mode/scheme/scheme.js
@@ -224,7 +224,7 @@ CodeMirror.defineMode("scheme", function () {
}
}
} else {
- stream.eatWhile(/[\w\$_\-!$%&*+\.\/:<=>?@\^~]/);
+ stream.eatWhile(/[\w_\-!$%&*+\.\/:<=>?@\^~]/);
if (keywords && keywords.propertyIsEnumerable(stream.current())) {
returnType = BUILTIN;
diff --git a/js/codemirror-5.23.0/mode/shell/index.html b/js/codemirror-5.39.0/mode/shell/index.html
similarity index 94%
rename from js/codemirror-5.23.0/mode/shell/index.html
rename to js/codemirror-5.39.0/mode/shell/index.html
index 0b56300..e42f4b5 100644
--- a/js/codemirror-5.23.0/mode/shell/index.html
+++ b/js/codemirror-5.39.0/mode/shell/index.html
@@ -62,5 +62,5 @@
Shell mode
});
-
MIME types defined: text/x-sh.
+
MIME types defined: text/x-sh, application/x-sh.
diff --git a/js/codemirror-5.23.0/mode/shell/shell.js b/js/codemirror-5.39.0/mode/shell/shell.js
similarity index 67%
rename from js/codemirror-5.23.0/mode/shell/shell.js
rename to js/codemirror-5.39.0/mode/shell/shell.js
index 570b4e2..b806c2b 100644
--- a/js/codemirror-5.23.0/mode/shell/shell.js
+++ b/js/codemirror-5.39.0/mode/shell/shell.js
@@ -30,9 +30,9 @@ CodeMirror.defineMode('shell', function() {
// Commands
define('builtin', 'ab awk bash beep cat cc cd chown chmod chroot clear cp ' +
- 'curl cut diff echo find gawk gcc get git grep kill killall ln ls make ' +
+ 'curl cut diff echo find gawk gcc get git grep hg kill killall ln ls make ' +
'mkdir openssl mv nc node npm ping ps restart rm rmdir sed service sh ' +
- 'shopt shred source sort sleep ssh start stop su sudo tee telnet top ' +
+ 'shopt shred source sort sleep ssh start stop su sudo svn tee telnet top ' +
'touch vi vim wall wc wget who write yes zsh');
function tokenBase(stream, state) {
@@ -46,7 +46,7 @@ CodeMirror.defineMode('shell', function() {
return null;
}
if (ch === '\'' || ch === '"' || ch === '`') {
- state.tokens.unshift(tokenString(ch));
+ state.tokens.unshift(tokenString(ch, ch === "`" ? "quote" : "string"));
return tokenize(stream, state);
}
if (ch === '#') {
@@ -81,41 +81,49 @@ CodeMirror.defineMode('shell', function() {
return words.hasOwnProperty(cur) ? words[cur] : null;
}
- function tokenString(quote) {
+ function tokenString(quote, style) {
+ var close = quote == "(" ? ")" : quote == "{" ? "}" : quote
return function(stream, state) {
- var next, end = false, escaped = false;
+ var next, escaped = false;
while ((next = stream.next()) != null) {
- if (next === quote && !escaped) {
- end = true;
+ if (next === close && !escaped) {
+ state.tokens.shift();
break;
- }
- if (next === '$' && !escaped && quote !== '\'') {
+ } else if (next === '$' && !escaped && quote !== "'" && stream.peek() != close) {
escaped = true;
stream.backUp(1);
state.tokens.unshift(tokenDollar);
break;
+ } else if (!escaped && quote !== close && next === quote) {
+ state.tokens.unshift(tokenString(quote, style))
+ return tokenize(stream, state)
+ } else if (!escaped && /['"]/.test(next) && !/['"]/.test(quote)) {
+ state.tokens.unshift(tokenStringStart(next, "string"));
+ stream.backUp(1);
+ break;
}
escaped = !escaped && next === '\\';
}
- if (end || !escaped) {
- state.tokens.shift();
- }
- return (quote === '`' || quote === ')' ? 'quote' : 'string');
+ return style;
};
};
+ function tokenStringStart(quote, style) {
+ return function(stream, state) {
+ state.tokens[0] = tokenString(quote, style)
+ stream.next()
+ return tokenize(stream, state)
+ }
+ }
+
var tokenDollar = function(stream, state) {
if (state.tokens.length > 1) stream.eat('$');
- var ch = stream.next(), hungry = /\w/;
- if (ch === '{') hungry = /[^}]/;
- if (ch === '(') {
- state.tokens[0] = tokenString(')');
+ var ch = stream.next()
+ if (/['"({]/.test(ch)) {
+ state.tokens[0] = tokenString(ch, ch == "(" ? "quote" : ch == "{" ? "def" : "string");
return tokenize(stream, state);
}
- if (!/\d/.test(ch)) {
- stream.eatWhile(hungry);
- stream.eat('}');
- }
+ if (!/\d/.test(ch)) stream.eatWhile(/\w/);
state.tokens.shift();
return 'def';
};
@@ -136,5 +144,8 @@ CodeMirror.defineMode('shell', function() {
});
CodeMirror.defineMIME('text/x-sh', 'shell');
+// Apache uses a slightly different Media Type for Shell scripts
+// http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types
+CodeMirror.defineMIME('application/x-sh', 'shell');
});
diff --git a/js/codemirror-5.23.0/mode/shell/test.js b/js/codemirror-5.39.0/mode/shell/test.js
similarity index 80%
rename from js/codemirror-5.23.0/mode/shell/test.js
rename to js/codemirror-5.39.0/mode/shell/test.js
index a413b5a..4be5572 100644
--- a/js/codemirror-5.23.0/mode/shell/test.js
+++ b/js/codemirror-5.39.0/mode/shell/test.js
@@ -55,4 +55,19 @@
"[builtin ls] [attribute -l] [attribute --human-readable]");
MT("operator",
"[def var][operator =]value");
+
+ MT("doubleParens",
+ "foo [quote $((bar))]")
+
+ MT("nested braces",
+ "[builtin echo] [def ${A[${B}]]}]")
+
+ MT("strings in parens",
+ "[def FOO][operator =]([quote $(<][string \"][def $MYDIR][string \"][quote /myfile grep ][string 'hello$'][quote )])")
+
+ MT ("string ending in dollar",
+ '[def a][operator =][string "xyz$"]; [def b][operator =][string "y"]')
+
+ MT ("quote ending in dollar",
+ "[quote $(echo a$)]")
})();
diff --git a/js/codemirror-5.23.0/mode/sieve/index.html b/js/codemirror-5.39.0/mode/sieve/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/sieve/index.html
rename to js/codemirror-5.39.0/mode/sieve/index.html
diff --git a/js/codemirror-5.23.0/mode/sieve/sieve.js b/js/codemirror-5.39.0/mode/sieve/sieve.js
similarity index 98%
rename from js/codemirror-5.23.0/mode/sieve/sieve.js
rename to js/codemirror-5.39.0/mode/sieve/sieve.js
index f67db2f..0920d0b 100644
--- a/js/codemirror-5.23.0/mode/sieve/sieve.js
+++ b/js/codemirror-5.39.0/mode/sieve/sieve.js
@@ -170,7 +170,7 @@ CodeMirror.defineMode("sieve", function(config) {
if (stream.eatSpace())
return null;
- return (state.tokenize || tokenBase)(stream, state);;
+ return (state.tokenize || tokenBase)(stream, state);
},
indent: function(state, _textAfter) {
diff --git a/js/codemirror-5.23.0/mode/slim/index.html b/js/codemirror-5.39.0/mode/slim/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/slim/index.html
rename to js/codemirror-5.39.0/mode/slim/index.html
diff --git a/js/codemirror-5.23.0/mode/slim/slim.js b/js/codemirror-5.39.0/mode/slim/slim.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/slim/slim.js
rename to js/codemirror-5.39.0/mode/slim/slim.js
diff --git a/js/codemirror-5.23.0/mode/slim/test.js b/js/codemirror-5.39.0/mode/slim/test.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/slim/test.js
rename to js/codemirror-5.39.0/mode/slim/test.js
diff --git a/js/codemirror-5.23.0/mode/smalltalk/index.html b/js/codemirror-5.39.0/mode/smalltalk/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/smalltalk/index.html
rename to js/codemirror-5.39.0/mode/smalltalk/index.html
diff --git a/js/codemirror-5.23.0/mode/smalltalk/smalltalk.js b/js/codemirror-5.39.0/mode/smalltalk/smalltalk.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/smalltalk/smalltalk.js
rename to js/codemirror-5.39.0/mode/smalltalk/smalltalk.js
diff --git a/js/codemirror-5.23.0/mode/smarty/index.html b/js/codemirror-5.39.0/mode/smarty/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/smarty/index.html
rename to js/codemirror-5.39.0/mode/smarty/index.html
diff --git a/js/codemirror-5.23.0/mode/smarty/smarty.js b/js/codemirror-5.39.0/mode/smarty/smarty.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/smarty/smarty.js
rename to js/codemirror-5.39.0/mode/smarty/smarty.js
diff --git a/js/codemirror-5.23.0/mode/solr/index.html b/js/codemirror-5.39.0/mode/solr/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/solr/index.html
rename to js/codemirror-5.39.0/mode/solr/index.html
diff --git a/js/codemirror-5.23.0/mode/solr/solr.js b/js/codemirror-5.39.0/mode/solr/solr.js
similarity index 95%
rename from js/codemirror-5.23.0/mode/solr/solr.js
rename to js/codemirror-5.39.0/mode/solr/solr.js
index f7f7087..dc8b825 100644
--- a/js/codemirror-5.23.0/mode/solr/solr.js
+++ b/js/codemirror-5.39.0/mode/solr/solr.js
@@ -14,12 +14,12 @@
CodeMirror.defineMode("solr", function() {
"use strict";
- var isStringChar = /[^\s\|\!\+\-\*\?\~\^\&\:\(\)\[\]\{\}\^\"\\]/;
+ var isStringChar = /[^\s\|\!\+\-\*\?\~\^\&\:\(\)\[\]\{\}\"\\]/;
var isOperatorChar = /[\|\!\+\-\*\?\~\^\&]/;
var isOperatorString = /^(OR|AND|NOT|TO)$/i;
function isNumber(word) {
- return parseFloat(word, 10).toString() === word;
+ return parseFloat(word).toString() === word;
}
function tokenString(quote) {
diff --git a/js/codemirror-5.23.0/mode/soy/index.html b/js/codemirror-5.39.0/mode/soy/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/soy/index.html
rename to js/codemirror-5.39.0/mode/soy/index.html
diff --git a/js/codemirror-5.23.0/mode/soy/soy.js b/js/codemirror-5.39.0/mode/soy/soy.js
similarity index 71%
rename from js/codemirror-5.23.0/mode/soy/soy.js
rename to js/codemirror-5.39.0/mode/soy/soy.js
index b9eec59..6b9d512 100644
--- a/js/codemirror-5.23.0/mode/soy/soy.js
+++ b/js/codemirror-5.39.0/mode/soy/soy.js
@@ -22,6 +22,7 @@
attributes: textMode,
text: textMode,
uri: textMode,
+ trusted_resource_uri: textMode,
css: CodeMirror.getMode(config, "text/css"),
js: CodeMirror.getMode(config, {name: "text/javascript", statementIndent: 2 * config.indentUnit})
};
@@ -31,6 +32,12 @@
}
function tokenUntil(stream, state, untilRegExp) {
+ if (stream.sol()) {
+ for (var indent = 0; indent < state.indent; indent++) {
+ if (!stream.eat(/\s/)) break;
+ }
+ if (indent) return null;
+ }
var oldString = stream.string;
var match = untilRegExp.exec(oldString.substr(stream.pos));
if (match) {
@@ -39,7 +46,8 @@
stream.string = oldString.substr(0, stream.pos + match.index);
}
var result = stream.hideFirstChars(state.indent, function() {
- return state.localMode.token(stream, state.localState);
+ var localState = last(state.localStates);
+ return localState.mode.token(stream, localState.state);
});
stream.string = oldString;
return result;
@@ -80,11 +88,14 @@
kindTag: [],
soyState: [],
templates: null,
- variables: null,
+ variables: prepend(null, 'ij'),
scopes: null,
indent: 0,
- localMode: modes.html,
- localState: CodeMirror.startState(modes.html)
+ quoteKind: null,
+ localStates: [{
+ mode: modes.html,
+ state: CodeMirror.startState(modes.html)
+ }]
};
},
@@ -98,8 +109,13 @@
variables: state.variables,
scopes: state.scopes,
indent: state.indent, // Indentation of the following line.
- localMode: state.localMode,
- localState: CodeMirror.copyState(state.localMode, state.localState)
+ quoteKind: state.quoteKind,
+ localStates: state.localStates.map(function(localState) {
+ return {
+ mode: localState.mode,
+ state: CodeMirror.copyState(localState.mode, localState.state)
+ };
+ })
};
},
@@ -113,8 +129,36 @@
} else {
stream.skipToEnd();
}
+ if (!state.scopes) {
+ var paramRe = /@param\??\s+(\S+)/g;
+ var current = stream.current();
+ for (var match; (match = paramRe.exec(current)); ) {
+ state.variables = prepend(state.variables, match[1]);
+ }
+ }
+ return "comment";
+
+ case "string":
+ var match = stream.match(/^.*?(["']|\\[\s\S])/);
+ if (!match) {
+ stream.skipToEnd();
+ } else if (match[1] == state.quoteKind) {
+ state.quoteKind = null;
+ state.soyState.pop();
+ }
+ return "string";
+ }
+
+ if (!state.soyState.length || last(state.soyState) != "literal") {
+ if (stream.match(/^\/\*/)) {
+ state.soyState.push("comment");
+ return "comment";
+ } else if (stream.match(stream.sol() ? /^\s*\/\/.*/ : /^\s+\/\/.*/)) {
return "comment";
+ }
+ }
+ switch (last(state.soyState)) {
case "templ-def":
if (match = stream.match(/^\.?([\w]+(?!\.[\w]+)*)/)) {
state.templates = prepend(state.templates, match[1]);
@@ -139,8 +183,8 @@
return null;
case "param-def":
- if (match = stream.match(/^([\w]+)(?=:)/)) {
- state.variables = prepend(state.variables, match[1]);
+ if (match = stream.match(/^\w+/)) {
+ state.variables = prepend(state.variables, match[0]);
state.soyState.pop();
state.soyState.push("param-type");
return "def";
@@ -172,6 +216,7 @@
if (stream.match(/^\/?}/)) {
if (state.tag == "/template" || state.tag == "/deltemplate") {
popscope(state);
+ state.variables = prepend(null, 'ij');
state.indent = 0;
} else {
if (state.tag == "/for" || state.tag == "/foreach") {
@@ -187,12 +232,20 @@
var kind = match[1];
state.kind.push(kind);
state.kindTag.push(state.tag);
- state.localMode = modes[kind] || modes.html;
- state.localState = CodeMirror.startState(state.localMode);
+ var mode = modes[kind] || modes.html;
+ var localState = last(state.localStates);
+ if (localState.mode.indent) {
+ state.indent += localState.mode.indent(localState.state, "");
+ }
+ state.localStates.push({
+ mode: mode,
+ state: CodeMirror.startState(mode)
+ });
}
return "attribute";
- } else if (stream.match(/^"/)) {
+ } else if (match = stream.match(/^["']/)) {
state.soyState.push("string");
+ state.quoteKind = match;
return "string";
}
if (match = stream.match(/^\$([\w]+)/)) {
@@ -211,55 +264,53 @@
return this.token(stream, state);
}
return tokenUntil(stream, state, /\{\/literal}/);
-
- case "string":
- var match = stream.match(/^.*?("|\\[\s\S])/);
- if (!match) {
- stream.skipToEnd();
- } else if (match[1] == "\"") {
- state.soyState.pop();
- }
- return "string";
}
- if (stream.match(/^\/\*/)) {
- state.soyState.push("comment");
- return "comment";
- } else if (stream.match(stream.sol() ? /^\s*\/\/.*/ : /^\s+\/\/.*/)) {
- return "comment";
- } else if (stream.match(/^\{literal}/)) {
+ if (stream.match(/^\{literal}/)) {
state.indent += config.indentUnit;
state.soyState.push("literal");
return "keyword";
- } else if (match = stream.match(/^\{([\/@\\]?[\w?]*)/)) {
+
+ // A tag-keyword must be followed by whitespace, comment or a closing tag.
+ } else if (match = stream.match(/^\{([/@\\]?\w+\??)(?=$|[\s}]|\/[/*])/)) {
if (match[1] != "/switch")
- state.indent += (/^(\/|(else|elseif|ifempty|case|default)$)/.test(match[1]) && state.tag != "switch" ? 1 : 2) * config.indentUnit;
+ state.indent += (/^(\/|(else|elseif|ifempty|case|fallbackmsg|default)$)/.test(match[1]) && state.tag != "switch" ? 1 : 2) * config.indentUnit;
state.tag = match[1];
if (state.tag == "/" + last(state.kindTag)) {
// We found the tag that opened the current kind="".
state.kind.pop();
state.kindTag.pop();
- state.localMode = modes[last(state.kind)] || modes.html;
- state.localState = CodeMirror.startState(state.localMode);
+ state.localStates.pop();
+ var localState = last(state.localStates);
+ if (localState.mode.indent) {
+ state.indent -= localState.mode.indent(localState.state, "");
+ }
}
state.soyState.push("tag");
if (state.tag == "template" || state.tag == "deltemplate") {
state.soyState.push("templ-def");
- }
- if (state.tag == "call" || state.tag == "delcall") {
+ } else if (state.tag == "call" || state.tag == "delcall") {
state.soyState.push("templ-ref");
- }
- if (state.tag == "let") {
+ } else if (state.tag == "let") {
state.soyState.push("var-def");
- }
- if (state.tag == "for" || state.tag == "foreach") {
+ } else if (state.tag == "for" || state.tag == "foreach") {
state.scopes = prepend(state.scopes, state.variables);
state.soyState.push("var-def");
- }
- if (state.tag.match(/^@param\??/)) {
+ } else if (state.tag == "namespace") {
+ if (!state.scopes) {
+ state.variables = prepend(null, 'ij');
+ }
+ } else if (state.tag.match(/^@(?:param\??|inject)/)) {
state.soyState.push("param-def");
}
return "keyword";
+
+ // Not a tag-keyword; it's an implicit print tag.
+ } else if (stream.eat('{')) {
+ state.tag = "print";
+ state.indent += 2 * config.indentUnit;
+ state.soyState.push("tag");
+ return "keyword";
}
return tokenUntil(stream, state, /\{|\s+\/\/|\/\*/);
@@ -277,14 +328,16 @@
if (state.tag != "switch" && /^\{(case|default)\b/.test(textAfter)) indent -= config.indentUnit;
if (/^\{\/switch\b/.test(textAfter)) indent -= config.indentUnit;
}
- if (indent && state.localMode.indent)
- indent += state.localMode.indent(state.localState, textAfter);
+ var localState = last(state.localStates);
+ if (indent && localState.mode.indent) {
+ indent += localState.mode.indent(localState.state, textAfter);
+ }
return indent;
},
innerMode: function(state) {
if (state.soyState.length && last(state.soyState) != "literal") return null;
- else return {state: state.localState, mode: state.localMode};
+ else return last(state.localStates);
},
electricInput: /^\s*\{(\/|\/template|\/deltemplate|\/switch|fallbackmsg|elseif|else|case|default|ifempty|\/literal\})$/,
@@ -292,6 +345,7 @@
blockCommentStart: "/*",
blockCommentEnd: "*/",
blockCommentContinue: " * ",
+ useInnerComments: false,
fold: "indent"
};
}, "htmlmixed");
diff --git a/js/codemirror-5.23.0/mode/soy/test.js b/js/codemirror-5.39.0/mode/soy/test.js
similarity index 68%
rename from js/codemirror-5.23.0/mode/soy/test.js
rename to js/codemirror-5.39.0/mode/soy/test.js
index 9e265c1..d503d7f 100644
--- a/js/codemirror-5.23.0/mode/soy/test.js
+++ b/js/codemirror-5.39.0/mode/soy/test.js
@@ -80,4 +80,42 @@
' nothing',
'[keyword {/foreach}]',
'');
+
+ MT('nested-kind-test',
+ '[keyword {template] [def .foo] [attribute kind]=[string "html"][keyword }]',
+ ' [tag&bracket <][tag div][tag&bracket >]',
+ ' [keyword {call] [variable .bar][keyword }]',
+ ' [keyword {param] [attribute kind]=[string "js"][keyword }]',
+ ' [keyword var] [def bar] [operator =] [number 5];',
+ ' [keyword {/param}]',
+ ' [keyword {/call}]',
+ ' [tag&bracket ][tag div][tag&bracket >]',
+ '[keyword {/template}]',
+ '');
+
+ MT('tag-starting-with-function-call-is-not-a-keyword',
+ '[keyword {]index([variable-2&error $foo])[keyword }]',
+ '[keyword {css] [string "some-class"][keyword }]',
+ '[keyword {]css([string "some-class"])[keyword }]',
+ '');
+
+ MT('allow-missing-colon-in-@param',
+ '[keyword {template] [def .foo][keyword }]',
+ ' [keyword {@param] [def showThing] [variable-3 bool][keyword }]',
+ ' [keyword {if] [variable-2 $showThing][keyword }]',
+ ' Yo!',
+ ' [keyword {/if}]',
+ '[keyword {/template}]',
+ '');
+
+ MT('single-quote-strings',
+ '[keyword {][string "foo"] [string \'bar\'][keyword }]',
+ '');
+
+ MT('literal-comments',
+ '[keyword {literal}]/* comment */ // comment[keyword {/literal}]');
+
+ MT('highlight-command-at-eol',
+ '[keyword {msg]',
+ ' [keyword }]');
})();
diff --git a/js/codemirror-5.23.0/mode/sparql/index.html b/js/codemirror-5.39.0/mode/sparql/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/sparql/index.html
rename to js/codemirror-5.39.0/mode/sparql/index.html
diff --git a/js/codemirror-5.23.0/mode/sparql/sparql.js b/js/codemirror-5.39.0/mode/sparql/sparql.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/sparql/sparql.js
rename to js/codemirror-5.39.0/mode/sparql/sparql.js
diff --git a/js/codemirror-5.23.0/mode/spreadsheet/index.html b/js/codemirror-5.39.0/mode/spreadsheet/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/spreadsheet/index.html
rename to js/codemirror-5.39.0/mode/spreadsheet/index.html
diff --git a/js/codemirror-5.23.0/mode/spreadsheet/spreadsheet.js b/js/codemirror-5.39.0/mode/spreadsheet/spreadsheet.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/spreadsheet/spreadsheet.js
rename to js/codemirror-5.39.0/mode/spreadsheet/spreadsheet.js
diff --git a/js/codemirror-5.23.0/mode/sql/index.html b/js/codemirror-5.39.0/mode/sql/index.html
similarity index 90%
rename from js/codemirror-5.23.0/mode/sql/index.html
rename to js/codemirror-5.39.0/mode/sql/index.html
index dba069d..b434f0f 100644
--- a/js/codemirror-5.23.0/mode/sql/index.html
+++ b/js/codemirror-5.39.0/mode/sql/index.html
@@ -49,7 +49,7 @@
SQL Mode for CodeMirror
LIMIT 1 OFFSET 0;
-
MIME types defined:
+
MIME types defined:
text/x-sql ,
text/x-mysql ,
text/x-mariadb ,
@@ -58,7 +58,9 @@
SQL Mode for CodeMirror
text/x-mssql ,
text/x-hive ,
text/x-pgsql ,
-
text/x-gql .
+
text/x-gql ,
+
text/x-gpsql .
+
text/x-esper .
+
sTeX mode supports this option:
+
+ inMathMode: boolean
+ Whether to start parsing in math mode (default: false).
+
+
MIME types defined: text/x-stex.
Parsing/Highlighting Tests: normal , verbose .
diff --git a/js/codemirror-5.23.0/mode/stex/stex.js b/js/codemirror-5.39.0/mode/stex/stex.js
similarity index 87%
rename from js/codemirror-5.23.0/mode/stex/stex.js
rename to js/codemirror-5.39.0/mode/stex/stex.js
index 835ed46..4490867 100644
--- a/js/codemirror-5.23.0/mode/stex/stex.js
+++ b/js/codemirror-5.39.0/mode/stex/stex.js
@@ -16,7 +16,7 @@
})(function(CodeMirror) {
"use strict";
- CodeMirror.defineMode("stex", function() {
+ CodeMirror.defineMode("stex", function(_config, parserConfig) {
"use strict";
function pushCommand(state, command) {
@@ -78,6 +78,14 @@
plugins["begin"] = addPluginPattern("begin", "tag", ["atom"]);
plugins["end"] = addPluginPattern("end", "tag", ["atom"]);
+ plugins["label" ] = addPluginPattern("label" , "tag", ["atom"]);
+ plugins["ref" ] = addPluginPattern("ref" , "tag", ["atom"]);
+ plugins["eqref" ] = addPluginPattern("eqref" , "tag", ["atom"]);
+ plugins["cite" ] = addPluginPattern("cite" , "tag", ["atom"]);
+ plugins["bibitem" ] = addPluginPattern("bibitem" , "tag", ["atom"]);
+ plugins["Bibitem" ] = addPluginPattern("Bibitem" , "tag", ["atom"]);
+ plugins["RBibitem" ] = addPluginPattern("RBibitem" , "tag", ["atom"]);
+
plugins["DEFAULT"] = function () {
this.name = "DEFAULT";
this.style = "tag";
@@ -117,6 +125,10 @@
setState(state, function(source, state){ return inMathMode(source, state, "\\]"); });
return "keyword";
}
+ if (source.match("\\(")) {
+ setState(state, function(source, state){ return inMathMode(source, state, "\\)"); });
+ return "keyword";
+ }
if (source.match("$$")) {
setState(state, function(source, state){ return inMathMode(source, state, "$$"); });
return "keyword";
@@ -161,7 +173,7 @@
if (source.eatSpace()) {
return null;
}
- if (source.match(endModeSeq)) {
+ if (endModeSeq && source.match(endModeSeq)) {
setState(state, normal);
return "keyword";
}
@@ -223,9 +235,10 @@
return {
startState: function() {
+ var f = parserConfig.inMathMode ? function(source, state){ return inMathMode(source, state); } : normal;
return {
cmdState: [],
- f: normal
+ f: f
};
},
copyState: function(s) {
diff --git a/js/codemirror-5.23.0/mode/stex/test.js b/js/codemirror-5.39.0/mode/stex/test.js
similarity index 83%
rename from js/codemirror-5.23.0/mode/stex/test.js
rename to js/codemirror-5.39.0/mode/stex/test.js
index 22f027e..634dc49 100644
--- a/js/codemirror-5.23.0/mode/stex/test.js
+++ b/js/codemirror-5.39.0/mode/stex/test.js
@@ -111,9 +111,18 @@
MT("inlineMath",
"[keyword $][number 3][variable-2 x][tag ^][number 2.45]-[tag \\sqrt][bracket {][tag \\$\\alpha][bracket }] = [number 2][keyword $] other text");
+ MT("inlineMathLatexStyle",
+ "[keyword \\(][number 3][variable-2 x][tag ^][number 2.45]-[tag \\sqrt][bracket {][tag \\$\\alpha][bracket }] = [number 2][keyword \\)] other text");
+
MT("displayMath",
"More [keyword $$]\t[variable-2 S][tag ^][variable-2 n][tag \\sum] [variable-2 i][keyword $$] other text");
+ MT("displayMath environment",
+ "[tag \\begin][bracket {][atom equation][bracket }] x [tag \\end][bracket {][atom equation][bracket }] other text");
+
+ MT("displayMath environment with label",
+ "[tag \\begin][bracket {][atom equation][bracket }][tag \\label][bracket {][atom eq1][bracket }] x [tag \\end][bracket {][atom equation][bracket }] other text~[tag \\ref][bracket {][atom eq1][bracket }]");
+
MT("mathWithComment",
"[keyword $][variable-2 x] [comment % $]",
"[variable-2 y][keyword $] other text");
diff --git a/js/codemirror-5.23.0/mode/stylus/index.html b/js/codemirror-5.39.0/mode/stylus/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/stylus/index.html
rename to js/codemirror-5.39.0/mode/stylus/index.html
diff --git a/js/codemirror-5.23.0/mode/stylus/stylus.js b/js/codemirror-5.39.0/mode/stylus/stylus.js
similarity index 99%
rename from js/codemirror-5.23.0/mode/stylus/stylus.js
rename to js/codemirror-5.39.0/mode/stylus/stylus.js
index 8d83a01..a9f50c0 100644
--- a/js/codemirror-5.23.0/mode/stylus/stylus.js
+++ b/js/codemirror-5.39.0/mode/stylus/stylus.js
@@ -15,6 +15,7 @@
CodeMirror.defineMode("stylus", function(config) {
var indentUnit = config.indentUnit,
+ indentUnitString = '',
tagKeywords = keySet(tagKeywords_),
tagVariablesRegexp = /^(a|b|i|s|col|em)$/i,
propertyKeywords = keySet(propertyKeywords_),
@@ -38,6 +39,8 @@
type,
override;
+ while (indentUnitString.length < indentUnit) indentUnitString += ' ';
+
/**
* Tokenizers
*/
@@ -73,7 +76,7 @@
if (ch == "#") {
stream.next();
// Hex color
- if (stream.match(/^[0-9a-f]{6}|[0-9a-f]{3}/i)) {
+ if (stream.match(/^[0-9a-f]{3}([0-9a-f]([0-9a-f]{2}){0,2})?\b/i)) {
return ["atom", "atom"];
}
// ID selector
@@ -313,7 +316,7 @@
return pushContext(state, stream, "block", 0);
}
}
- if (typeIsBlock(type, stream, state)) {
+ if (typeIsBlock(type, stream)) {
return pushContext(state, stream, "block");
}
if (type == "}" && endOfLine(stream)) {
@@ -513,7 +516,7 @@
*/
states.atBlock = function(type, stream, state) {
if (type == "(") return pushContext(state, stream, "atBlock_parens");
- if (typeIsBlock(type, stream, state)) {
+ if (typeIsBlock(type, stream)) {
return pushContext(state, stream, "block");
}
if (typeIsInterpolation(type, stream)) {
@@ -672,7 +675,7 @@
ch = textAfter && textAfter.charAt(0),
indent = cx.indent,
lineFirstWord = firstWordOfLine(textAfter),
- lineIndent = line.length - line.replace(/^\s*/, "").length,
+ lineIndent = line.match(/^\s*/)[0].replace(/\t/g, indentUnitString).length,
prevLineFirstWord = state.context.prev ? state.context.prev.line.firstWord : "",
prevLineIndent = state.context.prev ? state.context.prev.line.indent : lineIndent;
@@ -681,7 +684,6 @@
ch == ")" && (cx.type == "parens" || cx.type == "atBlock_parens") ||
ch == "{" && (cx.type == "at"))) {
indent = cx.indent - indentUnit;
- cx = cx.prev;
} else if (!(/(\})/.test(ch))) {
if (/@|\$|\d/.test(ch) ||
/^\{/.test(textAfter) ||
diff --git a/js/codemirror-5.23.0/mode/swift/index.html b/js/codemirror-5.39.0/mode/swift/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/swift/index.html
rename to js/codemirror-5.39.0/mode/swift/index.html
diff --git a/js/codemirror-5.23.0/mode/swift/swift.js b/js/codemirror-5.39.0/mode/swift/swift.js
similarity index 96%
rename from js/codemirror-5.23.0/mode/swift/swift.js
rename to js/codemirror-5.39.0/mode/swift/swift.js
index 43ab7c8..1795d86 100644
--- a/js/codemirror-5.23.0/mode/swift/swift.js
+++ b/js/codemirror-5.39.0/mode/swift/swift.js
@@ -138,8 +138,17 @@
}
function tokenComment(stream, state) {
- stream.match(/^(?:[^*]|\*(?!\/))*/)
- if (stream.match("*/")) state.tokenize.pop()
+ var ch
+ while (true) {
+ stream.match(/^[^/*]+/, true)
+ ch = stream.next()
+ if (!ch) break
+ if (ch === "/" && stream.eat("*")) {
+ state.tokenize.push(tokenComment)
+ } else if (ch === "*" && stream.eat("/")) {
+ state.tokenize.pop()
+ }
+ }
return "comment"
}
diff --git a/js/codemirror-5.23.0/mode/swift/test.js b/js/codemirror-5.39.0/mode/swift/test.js
similarity index 97%
rename from js/codemirror-5.23.0/mode/swift/test.js
rename to js/codemirror-5.39.0/mode/swift/test.js
index 786b89e..4091ac6 100644
--- a/js/codemirror-5.23.0/mode/swift/test.js
+++ b/js/codemirror-5.39.0/mode/swift/test.js
@@ -142,6 +142,13 @@
"[variable print][punctuation (][variable foo][property ._123][punctuation )]",
"[variable print][punctuation (]")
+ MT("nested_comments",
+ "[comment /*]",
+ "[comment But wait /* this is a nested comment */ for real]",
+ "[comment /**** let * me * show * you ****/]",
+ "[comment ///// let / me / show / you /////]",
+ "[comment */]");
+
// TODO: correctly identify when multiple variables are being declared
// by use of a comma-separated list.
// TODO: correctly identify when variables are being declared in a tuple.
diff --git a/js/codemirror-5.23.0/mode/tcl/index.html b/js/codemirror-5.39.0/mode/tcl/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/tcl/index.html
rename to js/codemirror-5.39.0/mode/tcl/index.html
diff --git a/js/codemirror-5.23.0/mode/tcl/tcl.js b/js/codemirror-5.39.0/mode/tcl/tcl.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/tcl/tcl.js
rename to js/codemirror-5.39.0/mode/tcl/tcl.js
diff --git a/js/codemirror-5.23.0/mode/textile/index.html b/js/codemirror-5.39.0/mode/textile/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/textile/index.html
rename to js/codemirror-5.39.0/mode/textile/index.html
diff --git a/js/codemirror-5.23.0/mode/textile/test.js b/js/codemirror-5.39.0/mode/textile/test.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/textile/test.js
rename to js/codemirror-5.39.0/mode/textile/test.js
diff --git a/js/codemirror-5.23.0/mode/textile/textile.js b/js/codemirror-5.39.0/mode/textile/textile.js
similarity index 99%
rename from js/codemirror-5.23.0/mode/textile/textile.js
rename to js/codemirror-5.39.0/mode/textile/textile.js
index a6f7576..bc5a2f3 100644
--- a/js/codemirror-5.23.0/mode/textile/textile.js
+++ b/js/codemirror-5.39.0/mode/textile/textile.js
@@ -203,7 +203,7 @@
single: {
bc: "bc",
bq: "bq",
- definitionList: /- [^(?::=)]+:=+/,
+ definitionList: /- .*?:=+/,
definitionListEnd: /.*=:\s*$/,
div: "div",
drawTable: /\|.*\|/,
diff --git a/js/codemirror-5.23.0/mode/tiddlywiki/index.html b/js/codemirror-5.39.0/mode/tiddlywiki/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/tiddlywiki/index.html
rename to js/codemirror-5.39.0/mode/tiddlywiki/index.html
diff --git a/js/codemirror-5.23.0/mode/tiddlywiki/tiddlywiki.css b/js/codemirror-5.39.0/mode/tiddlywiki/tiddlywiki.css
similarity index 100%
rename from js/codemirror-5.23.0/mode/tiddlywiki/tiddlywiki.css
rename to js/codemirror-5.39.0/mode/tiddlywiki/tiddlywiki.css
diff --git a/js/codemirror-5.23.0/mode/tiddlywiki/tiddlywiki.js b/js/codemirror-5.39.0/mode/tiddlywiki/tiddlywiki.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/tiddlywiki/tiddlywiki.js
rename to js/codemirror-5.39.0/mode/tiddlywiki/tiddlywiki.js
diff --git a/js/codemirror-5.23.0/mode/tiki/index.html b/js/codemirror-5.39.0/mode/tiki/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/tiki/index.html
rename to js/codemirror-5.39.0/mode/tiki/index.html
diff --git a/js/codemirror-5.23.0/mode/tiki/tiki.css b/js/codemirror-5.39.0/mode/tiki/tiki.css
similarity index 100%
rename from js/codemirror-5.23.0/mode/tiki/tiki.css
rename to js/codemirror-5.39.0/mode/tiki/tiki.css
diff --git a/js/codemirror-5.23.0/mode/tiki/tiki.js b/js/codemirror-5.39.0/mode/tiki/tiki.js
similarity index 97%
rename from js/codemirror-5.23.0/mode/tiki/tiki.js
rename to js/codemirror-5.39.0/mode/tiki/tiki.js
index 5e05b1f..b4794e4 100644
--- a/js/codemirror-5.23.0/mode/tiki/tiki.js
+++ b/js/codemirror-5.39.0/mode/tiki/tiki.js
@@ -144,7 +144,7 @@ CodeMirror.defineMode('tiki', function(config) {
type = "equals";
if (peek == ">") {
- ch = stream.next();
+ stream.next();
peek = stream.peek();
}
@@ -298,13 +298,13 @@ return {
if (context && context.noIndent) return 0;
if (context && /^{\//.test(textAfter))
context = context.prev;
- while (context && !context.startOfLine)
- context = context.prev;
- if (context) return context.indent + indentUnit;
- else return 0;
- },
- electricChars: "/"
- };
+ while (context && !context.startOfLine)
+ context = context.prev;
+ if (context) return context.indent + indentUnit;
+ else return 0;
+ },
+ electricChars: "/"
+};
});
CodeMirror.defineMIME("text/tiki", "tiki");
diff --git a/js/codemirror-5.23.0/mode/toml/index.html b/js/codemirror-5.39.0/mode/toml/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/toml/index.html
rename to js/codemirror-5.39.0/mode/toml/index.html
diff --git a/js/codemirror-5.23.0/mode/toml/toml.js b/js/codemirror-5.39.0/mode/toml/toml.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/toml/toml.js
rename to js/codemirror-5.39.0/mode/toml/toml.js
diff --git a/js/codemirror-5.23.0/mode/tornado/index.html b/js/codemirror-5.39.0/mode/tornado/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/tornado/index.html
rename to js/codemirror-5.39.0/mode/tornado/index.html
diff --git a/js/codemirror-5.23.0/mode/tornado/tornado.js b/js/codemirror-5.39.0/mode/tornado/tornado.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/tornado/tornado.js
rename to js/codemirror-5.39.0/mode/tornado/tornado.js
diff --git a/js/codemirror-5.23.0/mode/troff/index.html b/js/codemirror-5.39.0/mode/troff/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/troff/index.html
rename to js/codemirror-5.39.0/mode/troff/index.html
diff --git a/js/codemirror-5.23.0/mode/troff/troff.js b/js/codemirror-5.39.0/mode/troff/troff.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/troff/troff.js
rename to js/codemirror-5.39.0/mode/troff/troff.js
diff --git a/js/codemirror-5.23.0/mode/ttcn-cfg/index.html b/js/codemirror-5.39.0/mode/ttcn-cfg/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/ttcn-cfg/index.html
rename to js/codemirror-5.39.0/mode/ttcn-cfg/index.html
diff --git a/js/codemirror-5.23.0/mode/ttcn-cfg/ttcn-cfg.js b/js/codemirror-5.39.0/mode/ttcn-cfg/ttcn-cfg.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/ttcn-cfg/ttcn-cfg.js
rename to js/codemirror-5.39.0/mode/ttcn-cfg/ttcn-cfg.js
diff --git a/js/codemirror-5.23.0/mode/ttcn/index.html b/js/codemirror-5.39.0/mode/ttcn/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/ttcn/index.html
rename to js/codemirror-5.39.0/mode/ttcn/index.html
diff --git a/js/codemirror-5.23.0/mode/ttcn/ttcn.js b/js/codemirror-5.39.0/mode/ttcn/ttcn.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/ttcn/ttcn.js
rename to js/codemirror-5.39.0/mode/ttcn/ttcn.js
diff --git a/js/codemirror-5.23.0/mode/turtle/index.html b/js/codemirror-5.39.0/mode/turtle/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/turtle/index.html
rename to js/codemirror-5.39.0/mode/turtle/index.html
diff --git a/js/codemirror-5.23.0/mode/turtle/turtle.js b/js/codemirror-5.39.0/mode/turtle/turtle.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/turtle/turtle.js
rename to js/codemirror-5.39.0/mode/turtle/turtle.js
diff --git a/js/codemirror-5.23.0/mode/twig/index.html b/js/codemirror-5.39.0/mode/twig/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/twig/index.html
rename to js/codemirror-5.39.0/mode/twig/index.html
diff --git a/js/codemirror-5.23.0/mode/twig/twig.js b/js/codemirror-5.39.0/mode/twig/twig.js
similarity index 99%
rename from js/codemirror-5.23.0/mode/twig/twig.js
rename to js/codemirror-5.39.0/mode/twig/twig.js
index 1f2854b..b4e9897 100644
--- a/js/codemirror-5.23.0/mode/twig/twig.js
+++ b/js/codemirror-5.39.0/mode/twig/twig.js
@@ -95,7 +95,7 @@
}
return "variable";
} else if (stream.eat("{")) {
- if (ch = stream.eat("#")) {
+ if (stream.eat("#")) {
state.incomment = true;
if (!stream.skipTo("#}")) {
stream.skipToEnd();
diff --git a/js/codemirror-5.39.0/mode/vb/index.html b/js/codemirror-5.39.0/mode/vb/index.html
new file mode 100644
index 0000000..8697248
--- /dev/null
+++ b/js/codemirror-5.39.0/mode/vb/index.html
@@ -0,0 +1,49 @@
+
+
+
CodeMirror: VB.NET mode
+
+
+
+
+
+
+
+
+
+
+
+
+VB.NET mode
+
+
+Class rocket
+ Private quality as Double
+ Public Sub launch() as String
+ If quality > 0.8
+ launch = "Successful"
+ Else
+ launch = "Failed"
+ End If
+ End sub
+End class
+
+
+ MIME type defined: text/x-vb.
+
+
diff --git a/js/codemirror-5.23.0/mode/vb/vb.js b/js/codemirror-5.39.0/mode/vb/vb.js
similarity index 99%
rename from js/codemirror-5.23.0/mode/vb/vb.js
rename to js/codemirror-5.39.0/mode/vb/vb.js
index d78f91f..735eb7f 100644
--- a/js/codemirror-5.23.0/mode/vb/vb.js
+++ b/js/codemirror-5.39.0/mode/vb/vb.js
@@ -202,7 +202,6 @@ CodeMirror.defineMode("vb", function(conf, parserConf) {
// Handle '.' connected identifiers
if (current === '.') {
style = state.tokenize(stream, state);
- current = stream.current();
if (style === 'variable') {
return 'variable';
} else {
diff --git a/js/codemirror-5.23.0/mode/vbscript/index.html b/js/codemirror-5.39.0/mode/vbscript/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/vbscript/index.html
rename to js/codemirror-5.39.0/mode/vbscript/index.html
diff --git a/js/codemirror-5.23.0/mode/vbscript/vbscript.js b/js/codemirror-5.39.0/mode/vbscript/vbscript.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/vbscript/vbscript.js
rename to js/codemirror-5.39.0/mode/vbscript/vbscript.js
diff --git a/js/codemirror-5.23.0/mode/velocity/index.html b/js/codemirror-5.39.0/mode/velocity/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/velocity/index.html
rename to js/codemirror-5.39.0/mode/velocity/index.html
diff --git a/js/codemirror-5.23.0/mode/velocity/velocity.js b/js/codemirror-5.39.0/mode/velocity/velocity.js
similarity index 99%
rename from js/codemirror-5.23.0/mode/velocity/velocity.js
rename to js/codemirror-5.39.0/mode/velocity/velocity.js
index 12ee221..2525fda 100644
--- a/js/codemirror-5.23.0/mode/velocity/velocity.js
+++ b/js/codemirror-5.39.0/mode/velocity/velocity.js
@@ -82,7 +82,7 @@ CodeMirror.defineMode("velocity", function() {
}
// variable?
else if (ch == "$") {
- stream.eatWhile(/[\w\d\$_\.{}]/);
+ stream.eatWhile(/[\w\d\$_\.{}-]/);
// is it one of the specials?
if (specials && specials.propertyIsEnumerable(stream.current())) {
return "keyword";
diff --git a/js/codemirror-5.23.0/mode/verilog/index.html b/js/codemirror-5.39.0/mode/verilog/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/verilog/index.html
rename to js/codemirror-5.39.0/mode/verilog/index.html
diff --git a/js/codemirror-5.23.0/mode/verilog/test.js b/js/codemirror-5.39.0/mode/verilog/test.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/verilog/test.js
rename to js/codemirror-5.39.0/mode/verilog/test.js
diff --git a/js/codemirror-5.23.0/mode/verilog/verilog.js b/js/codemirror-5.39.0/mode/verilog/verilog.js
similarity index 99%
rename from js/codemirror-5.23.0/mode/verilog/verilog.js
rename to js/codemirror-5.39.0/mode/verilog/verilog.js
index 460cdb3..3404686 100644
--- a/js/codemirror-5.23.0/mode/verilog/verilog.js
+++ b/js/codemirror-5.39.0/mode/verilog/verilog.js
@@ -81,7 +81,7 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
// Block openings which are closed by a matching keyword in the form of ("end" + keyword)
// E.g. "task" => "endtask"
var blockKeywords = words(
- "case checker class clocking config function generate interface module package" +
+ "case checker class clocking config function generate interface module package " +
"primitive program property specify sequence table task"
);
@@ -602,7 +602,7 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
var prefix = match[1];
var mnemonic = match[2];
if (// is identifier prefix
- (prefix in tlvIdentifierStyle) &&
+ tlvIdentifierStyle.hasOwnProperty(prefix) &&
// has mnemonic or we're at the end of the line (maybe it hasn't been typed yet)
(mnemonic.length > 0 || stream.eol())) {
style = tlvIdentifierStyle[prefix];
diff --git a/js/codemirror-5.23.0/mode/vhdl/index.html b/js/codemirror-5.39.0/mode/vhdl/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/vhdl/index.html
rename to js/codemirror-5.39.0/mode/vhdl/index.html
diff --git a/js/codemirror-5.23.0/mode/vhdl/vhdl.js b/js/codemirror-5.39.0/mode/vhdl/vhdl.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/vhdl/vhdl.js
rename to js/codemirror-5.39.0/mode/vhdl/vhdl.js
diff --git a/js/codemirror-5.23.0/mode/vue/index.html b/js/codemirror-5.39.0/mode/vue/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/vue/index.html
rename to js/codemirror-5.39.0/mode/vue/index.html
diff --git a/js/codemirror-5.23.0/mode/vue/vue.js b/js/codemirror-5.39.0/mode/vue/vue.js
similarity index 86%
rename from js/codemirror-5.23.0/mode/vue/vue.js
rename to js/codemirror-5.39.0/mode/vue/vue.js
index c0eab6b..84cd07c 100644
--- a/js/codemirror-5.23.0/mode/vue/vue.js
+++ b/js/codemirror-5.39.0/mode/vue/vue.js
@@ -32,13 +32,20 @@
var tagLanguages = {
script: [
["lang", /coffee(script)?/, "coffeescript"],
- ["type", /^(?:text|application)\/(?:x-)?coffee(?:script)?$/, "coffeescript"]
+ ["type", /^(?:text|application)\/(?:x-)?coffee(?:script)?$/, "coffeescript"],
+ ["lang", /^babel$/, "javascript"],
+ ["type", /^text\/babel$/, "javascript"],
+ ["type", /^text\/ecmascript-\d+$/, "javascript"]
],
style: [
["lang", /^stylus$/i, "stylus"],
["lang", /^sass$/i, "sass"],
+ ["lang", /^less$/i, "text/x-less"],
+ ["lang", /^scss$/i, "text/x-scss"],
["type", /^(text\/)?(x-)?styl(us)?$/i, "stylus"],
- ["type", /^text\/sass/i, "sass"]
+ ["type", /^text\/sass/i, "sass"],
+ ["type", /^(text\/)?(x-)?scss$/i, "text/x-scss"],
+ ["type", /^(text\/)?(x-)?less$/i, "text/x-less"]
],
template: [
["lang", /^vue-template$/i, "vue"],
diff --git a/js/codemirror-5.23.0/mode/webidl/index.html b/js/codemirror-5.39.0/mode/webidl/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/webidl/index.html
rename to js/codemirror-5.39.0/mode/webidl/index.html
diff --git a/js/codemirror-5.23.0/mode/webidl/webidl.js b/js/codemirror-5.39.0/mode/webidl/webidl.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/webidl/webidl.js
rename to js/codemirror-5.39.0/mode/webidl/webidl.js
diff --git a/js/codemirror-5.23.0/mode/xml/index.html b/js/codemirror-5.39.0/mode/xml/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/xml/index.html
rename to js/codemirror-5.39.0/mode/xml/index.html
diff --git a/js/codemirror-5.23.0/mode/xml/test.js b/js/codemirror-5.39.0/mode/xml/test.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/xml/test.js
rename to js/codemirror-5.39.0/mode/xml/test.js
diff --git a/js/codemirror-5.23.0/mode/xml/xml.js b/js/codemirror-5.39.0/mode/xml/xml.js
similarity index 97%
rename from js/codemirror-5.23.0/mode/xml/xml.js
rename to js/codemirror-5.39.0/mode/xml/xml.js
index f987a3a..5927bc9 100644
--- a/js/codemirror-5.23.0/mode/xml/xml.js
+++ b/js/codemirror-5.39.0/mode/xml/xml.js
@@ -52,6 +52,7 @@ var xmlConfig = {
doNotIndent: {},
allowUnquoted: false,
allowMissing: false,
+ allowMissingTagName: false,
caseFold: false
}
@@ -162,8 +163,9 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {
stream.next();
}
return style;
- };
+ }
}
+
function doctype(depth) {
return function(stream, state) {
var ch;
@@ -226,6 +228,9 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {
state.tagName = stream.current();
setStyle = "tag";
return attrState;
+ } else if (config.allowMissingTagName && type == "endTag") {
+ setStyle = "tag bracket";
+ return attrState(type, stream, state);
} else {
setStyle = "error";
return tagNameState;
@@ -244,6 +249,9 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {
setStyle = "tag error";
return closeStateErr;
}
+ } else if (config.allowMissingTagName && type == "endTag") {
+ setStyle = "tag bracket";
+ return closeState(type, stream, state);
} else {
setStyle = "error";
return closeStateErr;
diff --git a/js/codemirror-5.23.0/mode/xquery/index.html b/js/codemirror-5.39.0/mode/xquery/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/xquery/index.html
rename to js/codemirror-5.39.0/mode/xquery/index.html
diff --git a/js/codemirror-5.23.0/mode/xquery/test.js b/js/codemirror-5.39.0/mode/xquery/test.js
similarity index 89%
rename from js/codemirror-5.23.0/mode/xquery/test.js
rename to js/codemirror-5.39.0/mode/xquery/test.js
index 1f148cd..9697f9b 100644
--- a/js/codemirror-5.23.0/mode/xquery/test.js
+++ b/js/codemirror-5.39.0/mode/xquery/test.js
@@ -20,14 +20,14 @@
" [def&variable fn:doc]()[[ [variable foo][keyword /][variable @bar] [keyword eq] [variable $let] ]],",
" [keyword //][variable x] } [comment (: a more 'evil' test :)]",
" [comment (: Modified Blakeley example (: with nested comment :) ... :)]",
- " [keyword declare] [keyword private] [keyword function] [def&variable local:declare]() {()}[variable ;]",
- " [keyword declare] [keyword private] [keyword function] [def&variable local:private]() {()}[variable ;]",
- " [keyword declare] [keyword private] [keyword function] [def&variable local:function]() {()}[variable ;]",
- " [keyword declare] [keyword private] [keyword function] [def&variable local:local]() {()}[variable ;]",
+ " [keyword declare] [variable private] [keyword function] [def&variable local:declare]() {()}[variable ;]",
+ " [keyword declare] [variable private] [keyword function] [def&variable local:private]() {()}[variable ;]",
+ " [keyword declare] [variable private] [keyword function] [def&variable local:function]() {()}[variable ;]",
+ " [keyword declare] [variable private] [keyword function] [def&variable local:local]() {()}[variable ;]",
" [keyword let] [variable $let] [keyword :=] [variable <let>let] [variable $let] [keyword :=] [variable "let"<][keyword /let][variable >]",
" [keyword return] [keyword element] [variable element] {",
" [keyword attribute] [variable attribute] { [keyword try] { [def&variable xdmp:version]() } [keyword catch]([variable $e]) { [def&variable xdmp:log]([variable $e]) } },",
- " [keyword attribute] [variable fn:doc] { [variable "bar"] [variable castable] [keyword as] [atom xs:string] },",
+ " [keyword attribute] [variable fn:doc] { [variable "bar"] [keyword castable] [keyword as] [atom xs:string] },",
" [keyword element] [variable text] { [keyword text] { [variable "text"] } },",
" [def&variable fn:doc]()[[ [qualifier child::][variable eq][keyword /]([variable @bar] [keyword |] [qualifier attribute::][variable attribute]) [keyword eq] [variable $let] ]],",
" [keyword //][variable fn:doc]",
diff --git a/js/codemirror-5.23.0/mode/xquery/xquery.js b/js/codemirror-5.39.0/mode/xquery/xquery.js
similarity index 80%
rename from js/codemirror-5.23.0/mode/xquery/xquery.js
rename to js/codemirror-5.39.0/mode/xquery/xquery.js
index 75dcbee..f5db831 100644
--- a/js/codemirror-5.23.0/mode/xquery/xquery.js
+++ b/js/codemirror-5.39.0/mode/xquery/xquery.js
@@ -19,41 +19,52 @@ CodeMirror.defineMode("xquery", function() {
var keywords = function(){
// convenience functions used to build keywords object
function kw(type) {return {type: type, style: "keyword"};}
- var A = kw("keyword a")
- , B = kw("keyword b")
- , C = kw("keyword c")
- , operator = kw("operator")
+ var operator = kw("operator")
, atom = {type: "atom", style: "atom"}
, punctuation = {type: "punctuation", style: null}
, qualifier = {type: "axis_specifier", style: "qualifier"};
// kwObj is what is return from this function at the end
var kwObj = {
- 'if': A, 'switch': A, 'while': A, 'for': A,
- 'else': B, 'then': B, 'try': B, 'finally': B, 'catch': B,
- 'element': C, 'attribute': C, 'let': C, 'implements': C, 'import': C, 'module': C, 'namespace': C,
- 'return': C, 'super': C, 'this': C, 'throws': C, 'where': C, 'private': C,
- ',': punctuation,
- 'null': atom, 'fn:false()': atom, 'fn:true()': atom
+ ',': punctuation
};
// a list of 'basic' keywords. For each add a property to kwObj with the value of
// {type: basic[i], style: "keyword"} e.g. 'after' --> {type: "after", style: "keyword"}
- var basic = ['after','ancestor','ancestor-or-self','and','as','ascending','assert','attribute','before',
- 'by','case','cast','child','comment','declare','default','define','descendant','descendant-or-self',
- 'descending','document','document-node','element','else','eq','every','except','external','following',
- 'following-sibling','follows','for','function','if','import','in','instance','intersect','item',
- 'let','module','namespace','node','node','of','only','or','order','parent','precedes','preceding',
- 'preceding-sibling','processing-instruction','ref','return','returns','satisfies','schema','schema-element',
- 'self','some','sortby','stable','text','then','to','treat','typeswitch','union','variable','version','where',
- 'xquery', 'empty-sequence'];
+ var basic = ['after', 'all', 'allowing', 'ancestor', 'ancestor-or-self', 'any', 'array', 'as',
+ 'ascending', 'at', 'attribute', 'base-uri', 'before', 'boundary-space', 'by', 'case', 'cast',
+ 'castable', 'catch', 'child', 'collation', 'comment', 'construction', 'contains', 'content',
+ 'context', 'copy', 'copy-namespaces', 'count', 'decimal-format', 'declare', 'default', 'delete',
+ 'descendant', 'descendant-or-self', 'descending', 'diacritics', 'different', 'distance',
+ 'document', 'document-node', 'element', 'else', 'empty', 'empty-sequence', 'encoding', 'end',
+ 'entire', 'every', 'exactly', 'except', 'external', 'first', 'following', 'following-sibling',
+ 'for', 'from', 'ftand', 'ftnot', 'ft-option', 'ftor', 'function', 'fuzzy', 'greatest', 'group',
+ 'if', 'import', 'in', 'inherit', 'insensitive', 'insert', 'instance', 'intersect', 'into',
+ 'invoke', 'is', 'item', 'language', 'last', 'lax', 'least', 'let', 'levels', 'lowercase', 'map',
+ 'modify', 'module', 'most', 'namespace', 'next', 'no', 'node', 'nodes', 'no-inherit',
+ 'no-preserve', 'not', 'occurs', 'of', 'only', 'option', 'order', 'ordered', 'ordering',
+ 'paragraph', 'paragraphs', 'parent', 'phrase', 'preceding', 'preceding-sibling', 'preserve',
+ 'previous', 'processing-instruction', 'relationship', 'rename', 'replace', 'return',
+ 'revalidation', 'same', 'satisfies', 'schema', 'schema-attribute', 'schema-element', 'score',
+ 'self', 'sensitive', 'sentence', 'sentences', 'sequence', 'skip', 'sliding', 'some', 'stable',
+ 'start', 'stemming', 'stop', 'strict', 'strip', 'switch', 'text', 'then', 'thesaurus', 'times',
+ 'to', 'transform', 'treat', 'try', 'tumbling', 'type', 'typeswitch', 'union', 'unordered',
+ 'update', 'updating', 'uppercase', 'using', 'validate', 'value', 'variable', 'version',
+ 'weight', 'when', 'where', 'wildcards', 'window', 'with', 'without', 'word', 'words', 'xquery'];
for(var i=0, l=basic.length; i < l; i++) { kwObj[basic[i]] = kw(basic[i]);};
// a list of types. For each add a property to kwObj with the value of
// {type: "atom", style: "atom"}
- var types = ['xs:string', 'xs:float', 'xs:decimal', 'xs:double', 'xs:integer', 'xs:boolean', 'xs:date', 'xs:dateTime',
- 'xs:time', 'xs:duration', 'xs:dayTimeDuration', 'xs:time', 'xs:yearMonthDuration', 'numeric', 'xs:hexBinary',
- 'xs:base64Binary', 'xs:anyURI', 'xs:QName', 'xs:byte','xs:boolean','xs:anyURI','xf:yearMonthDuration'];
+ var types = ['xs:anyAtomicType', 'xs:anySimpleType', 'xs:anyType', 'xs:anyURI',
+ 'xs:base64Binary', 'xs:boolean', 'xs:byte', 'xs:date', 'xs:dateTime', 'xs:dateTimeStamp',
+ 'xs:dayTimeDuration', 'xs:decimal', 'xs:double', 'xs:duration', 'xs:ENTITIES', 'xs:ENTITY',
+ 'xs:float', 'xs:gDay', 'xs:gMonth', 'xs:gMonthDay', 'xs:gYear', 'xs:gYearMonth', 'xs:hexBinary',
+ 'xs:ID', 'xs:IDREF', 'xs:IDREFS', 'xs:int', 'xs:integer', 'xs:item', 'xs:java', 'xs:language',
+ 'xs:long', 'xs:Name', 'xs:NCName', 'xs:negativeInteger', 'xs:NMTOKEN', 'xs:NMTOKENS',
+ 'xs:nonNegativeInteger', 'xs:nonPositiveInteger', 'xs:normalizedString', 'xs:NOTATION',
+ 'xs:numeric', 'xs:positiveInteger', 'xs:precisionDecimal', 'xs:QName', 'xs:short', 'xs:string',
+ 'xs:time', 'xs:token', 'xs:unsignedByte', 'xs:unsignedInt', 'xs:unsignedLong',
+ 'xs:unsignedShort', 'xs:untyped', 'xs:untypedAtomic', 'xs:yearMonthDuration'];
for(var i=0, l=types.length; i < l; i++) { kwObj[types[i]] = atom;};
// each operator will add a property to kwObj with value of {type: "operator", style: "keyword"}
@@ -102,7 +113,7 @@ CodeMirror.defineMode("xquery", function() {
}
// start code block
else if(ch == "{") {
- pushStateStack(state,{ type: "codeblock"});
+ pushStateStack(state, { type: "codeblock"});
return null;
}
// end code block
@@ -132,7 +143,7 @@ CodeMirror.defineMode("xquery", function() {
return chain(stream, state, tokenComment);
}
// quoted string
- else if ( !isEQName && (ch === '"' || ch === "'"))
+ else if (!isEQName && (ch === '"' || ch === "'"))
return chain(stream, state, tokenString(ch));
// variable
else if(ch === "$") {
diff --git a/js/codemirror-5.23.0/mode/yacas/index.html b/js/codemirror-5.39.0/mode/yacas/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/yacas/index.html
rename to js/codemirror-5.39.0/mode/yacas/index.html
diff --git a/js/codemirror-5.23.0/mode/yacas/yacas.js b/js/codemirror-5.39.0/mode/yacas/yacas.js
similarity index 99%
rename from js/codemirror-5.23.0/mode/yacas/yacas.js
rename to js/codemirror-5.39.0/mode/yacas/yacas.js
index 30bd60b..34c84fb 100644
--- a/js/codemirror-5.23.0/mode/yacas/yacas.js
+++ b/js/codemirror-5.39.0/mode/yacas/yacas.js
@@ -125,7 +125,7 @@ CodeMirror.defineMode('yacas', function(_config, _parserConfig) {
}
// operators; note that operators like @@ or /; are matched separately for each symbol.
- if (stream.match(/(?:\\|\+|\-|\*|\/|,|;|\.|:|@|~|=|>|<|&|\||_|`|'|\^|\?|!|%)/, true, false)) {
+ if (stream.match(/(?:\\|\+|\-|\*|\/|,|;|\.|:|@|~|=|>|<|&|\||_|`|'|\^|\?|!|%|#)/, true, false)) {
return 'operator';
}
diff --git a/js/codemirror-5.23.0/mode/yaml-frontmatter/index.html b/js/codemirror-5.39.0/mode/yaml-frontmatter/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/yaml-frontmatter/index.html
rename to js/codemirror-5.39.0/mode/yaml-frontmatter/index.html
diff --git a/js/codemirror-5.23.0/mode/yaml-frontmatter/yaml-frontmatter.js b/js/codemirror-5.39.0/mode/yaml-frontmatter/yaml-frontmatter.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/yaml-frontmatter/yaml-frontmatter.js
rename to js/codemirror-5.39.0/mode/yaml-frontmatter/yaml-frontmatter.js
diff --git a/js/codemirror-5.23.0/mode/yaml/index.html b/js/codemirror-5.39.0/mode/yaml/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/yaml/index.html
rename to js/codemirror-5.39.0/mode/yaml/index.html
diff --git a/js/codemirror-5.23.0/mode/yaml/yaml.js b/js/codemirror-5.39.0/mode/yaml/yaml.js
similarity index 99%
rename from js/codemirror-5.23.0/mode/yaml/yaml.js
rename to js/codemirror-5.39.0/mode/yaml/yaml.js
index 59c0ecd..f35a401 100644
--- a/js/codemirror-5.23.0/mode/yaml/yaml.js
+++ b/js/codemirror-5.39.0/mode/yaml/yaml.js
@@ -108,7 +108,8 @@ CodeMirror.defineMode("yaml", function() {
literal: false,
escaped: false
};
- }
+ },
+ lineComment: "#"
};
});
diff --git a/js/codemirror-5.23.0/mode/z80/index.html b/js/codemirror-5.39.0/mode/z80/index.html
similarity index 100%
rename from js/codemirror-5.23.0/mode/z80/index.html
rename to js/codemirror-5.39.0/mode/z80/index.html
diff --git a/js/codemirror-5.23.0/mode/z80/z80.js b/js/codemirror-5.39.0/mode/z80/z80.js
similarity index 100%
rename from js/codemirror-5.23.0/mode/z80/z80.js
rename to js/codemirror-5.39.0/mode/z80/z80.js
diff --git a/js/codemirror-5.23.0/package.json b/js/codemirror-5.39.0/package.json
similarity index 84%
rename from js/codemirror-5.23.0/package.json
rename to js/codemirror-5.39.0/package.json
index f7b617c..bd35328 100644
--- a/js/codemirror-5.23.0/package.json
+++ b/js/codemirror-5.39.0/package.json
@@ -1,7 +1,8 @@
{
"name": "codemirror",
- "version": "5.23.0",
+ "version": "5.39.1",
"main": "lib/codemirror.js",
+ "style": "lib/codemirror.css",
"description": "Full-featured in-browser code editor",
"license": "MIT",
"directories": {
@@ -10,17 +11,17 @@
"scripts": {
"build": "rollup -c",
"watch": "rollup -w -c",
- "prepublish": "npm run-script build",
+ "prepare": "npm run-script build",
"test": "node ./test/run.js",
"lint": "bin/lint"
},
"devDependencies": {
- "blint": "^0.5.1",
+ "blint": "^1",
"node-static": "0.6.0",
"phantomjs-prebuilt": "^2.1.12",
- "rollup": "^0.34.10",
+ "rollup": "^0.41.0",
"rollup-plugin-buble": "^0.15.0",
- "rollup-watch": "^2.5.0"
+ "rollup-watch": "^3.2.0"
},
"bugs": "http://github.com/codemirror/CodeMirror/issues",
"keywords": [
diff --git a/js/codemirror-5.23.0/rollup.config.js b/js/codemirror-5.39.0/rollup.config.js
similarity index 100%
rename from js/codemirror-5.23.0/rollup.config.js
rename to js/codemirror-5.39.0/rollup.config.js
diff --git a/js/codemirror-5.39.0/src/codemirror.js b/js/codemirror-5.39.0/src/codemirror.js
new file mode 100644
index 0000000..2a2f54e
--- /dev/null
+++ b/js/codemirror-5.39.0/src/codemirror.js
@@ -0,0 +1,3 @@
+import { CodeMirror } from "./edit/main.js"
+
+export default CodeMirror
diff --git a/js/codemirror-5.23.0/src/display/Display.js b/js/codemirror-5.39.0/src/display/Display.js
similarity index 91%
rename from js/codemirror-5.23.0/src/display/Display.js
rename to js/codemirror-5.39.0/src/display/Display.js
index c1879e7..54b228a 100644
--- a/js/codemirror-5.23.0/src/display/Display.js
+++ b/js/codemirror-5.39.0/src/display/Display.js
@@ -1,6 +1,6 @@
-import { gecko, ie, ie_version, mobile, webkit } from "../util/browser"
-import { elt } from "../util/dom"
-import { scrollerGap } from "../util/misc"
+import { gecko, ie, ie_version, mobile, webkit } from "../util/browser.js"
+import { elt, eltP } from "../util/dom.js"
+import { scrollerGap } from "../util/misc.js"
// The display handles the DOM integration, both for input reading
// and content drawing. It holds references to DOM nodes and
@@ -18,7 +18,7 @@ export function Display(place, doc, input) {
d.gutterFiller = elt("div", null, "CodeMirror-gutter-filler")
d.gutterFiller.setAttribute("cm-not-content", "true")
// Will contain the actual code, positioned to cover the viewport.
- d.lineDiv = elt("div", null, "CodeMirror-code")
+ d.lineDiv = eltP("div", null, "CodeMirror-code")
// Elements are added to these to represent selection and cursors.
d.selectionDiv = elt("div", null, null, "position: relative; z-index: 1")
d.cursorDiv = elt("div", null, "CodeMirror-cursors")
@@ -27,10 +27,11 @@ export function Display(place, doc, input) {
// When lines outside of the viewport are measured, they are drawn in this.
d.lineMeasure = elt("div", null, "CodeMirror-measure")
// Wraps everything that needs to exist inside the vertically-padded coordinate system
- d.lineSpace = elt("div", [d.measure, d.lineMeasure, d.selectionDiv, d.cursorDiv, d.lineDiv],
+ d.lineSpace = eltP("div", [d.measure, d.lineMeasure, d.selectionDiv, d.cursorDiv, d.lineDiv],
null, "position: relative; outline: none")
+ let lines = eltP("div", [d.lineSpace], "CodeMirror-lines")
// Moved around its parent to cover visible view.
- d.mover = elt("div", [elt("div", [d.lineSpace], "CodeMirror-lines")], null, "position: relative")
+ d.mover = elt("div", [lines], null, "position: relative")
// Set to the height of the document, allowing scrolling.
d.sizer = elt("div", [d.mover], "CodeMirror-sizer")
d.sizerWidth = null
diff --git a/js/codemirror-5.23.0/src/display/focus.js b/js/codemirror-5.39.0/src/display/focus.js
similarity index 87%
rename from js/codemirror-5.23.0/src/display/focus.js
rename to js/codemirror-5.39.0/src/display/focus.js
index ee52daf..aa731b4 100644
--- a/js/codemirror-5.23.0/src/display/focus.js
+++ b/js/codemirror-5.39.0/src/display/focus.js
@@ -1,7 +1,7 @@
-import { restartBlink } from "./selection"
-import { webkit } from "../util/browser"
-import { addClass, rmClass } from "../util/dom"
-import { signal } from "../util/event"
+import { restartBlink } from "./selection.js"
+import { webkit } from "../util/browser.js"
+import { addClass, rmClass } from "../util/dom.js"
+import { signal } from "../util/event.js"
export function ensureFocus(cm) {
if (!cm.state.focused) { cm.display.input.focus(); onFocus(cm) }
diff --git a/js/codemirror-5.23.0/src/display/gutters.js b/js/codemirror-5.39.0/src/display/gutters.js
similarity index 88%
rename from js/codemirror-5.23.0/src/display/gutters.js
rename to js/codemirror-5.39.0/src/display/gutters.js
index 7ccf119..37405b6 100644
--- a/js/codemirror-5.23.0/src/display/gutters.js
+++ b/js/codemirror-5.39.0/src/display/gutters.js
@@ -1,7 +1,7 @@
-import { elt, removeChildren } from "../util/dom"
-import { indexOf } from "../util/misc"
+import { elt, removeChildren } from "../util/dom.js"
+import { indexOf } from "../util/misc.js"
-import { updateGutterSpace } from "./update_display"
+import { updateGutterSpace } from "./update_display.js"
// Rebuild the gutter elements, ensure the margin to the left of the
// code matches their width.
diff --git a/js/codemirror-5.39.0/src/display/highlight_worker.js b/js/codemirror-5.39.0/src/display/highlight_worker.js
new file mode 100644
index 0000000..6069815
--- /dev/null
+++ b/js/codemirror-5.39.0/src/display/highlight_worker.js
@@ -0,0 +1,55 @@
+import { getContextBefore, highlightLine, processLine } from "../line/highlight.js"
+import { copyState } from "../modes.js"
+import { bind } from "../util/misc.js"
+
+import { runInOp } from "./operations.js"
+import { regLineChange } from "./view_tracking.js"
+
+// HIGHLIGHT WORKER
+
+export function startWorker(cm, time) {
+ if (cm.doc.highlightFrontier < cm.display.viewTo)
+ cm.state.highlight.set(time, bind(highlightWorker, cm))
+}
+
+function highlightWorker(cm) {
+ let doc = cm.doc
+ if (doc.highlightFrontier >= cm.display.viewTo) return
+ let end = +new Date + cm.options.workTime
+ let context = getContextBefore(cm, doc.highlightFrontier)
+ let changedLines = []
+
+ doc.iter(context.line, Math.min(doc.first + doc.size, cm.display.viewTo + 500), line => {
+ if (context.line >= cm.display.viewFrom) { // Visible
+ let oldStyles = line.styles
+ let resetState = line.text.length > cm.options.maxHighlightLength ? copyState(doc.mode, context.state) : null
+ let highlighted = highlightLine(cm, line, context, true)
+ if (resetState) context.state = resetState
+ line.styles = highlighted.styles
+ let oldCls = line.styleClasses, newCls = highlighted.classes
+ if (newCls) line.styleClasses = newCls
+ else if (oldCls) line.styleClasses = null
+ let ischange = !oldStyles || oldStyles.length != line.styles.length ||
+ oldCls != newCls && (!oldCls || !newCls || oldCls.bgClass != newCls.bgClass || oldCls.textClass != newCls.textClass)
+ for (let i = 0; !ischange && i < oldStyles.length; ++i) ischange = oldStyles[i] != line.styles[i]
+ if (ischange) changedLines.push(context.line)
+ line.stateAfter = context.save()
+ context.nextLine()
+ } else {
+ if (line.text.length <= cm.options.maxHighlightLength)
+ processLine(cm, line.text, context)
+ line.stateAfter = context.line % 5 == 0 ? context.save() : null
+ context.nextLine()
+ }
+ if (+new Date > end) {
+ startWorker(cm, cm.options.workDelay)
+ return true
+ }
+ })
+ doc.highlightFrontier = context.line
+ doc.modeFrontier = Math.max(doc.modeFrontier, context.line)
+ if (changedLines.length) runInOp(cm, () => {
+ for (let i = 0; i < changedLines.length; i++)
+ regLineChange(cm, changedLines[i], "text")
+ })
+}
diff --git a/js/codemirror-5.23.0/src/display/line_numbers.js b/js/codemirror-5.39.0/src/display/line_numbers.js
similarity index 92%
rename from js/codemirror-5.23.0/src/display/line_numbers.js
rename to js/codemirror-5.39.0/src/display/line_numbers.js
index c48f220..3ab9575 100644
--- a/js/codemirror-5.23.0/src/display/line_numbers.js
+++ b/js/codemirror-5.39.0/src/display/line_numbers.js
@@ -1,8 +1,8 @@
-import { lineNumberFor } from "../line/utils_line"
-import { compensateForHScroll } from "../measurement/position_measurement"
-import { elt } from "../util/dom"
+import { lineNumberFor } from "../line/utils_line.js"
+import { compensateForHScroll } from "../measurement/position_measurement.js"
+import { elt } from "../util/dom.js"
-import { updateGutterSpace } from "./update_display"
+import { updateGutterSpace } from "./update_display.js"
// Re-align line numbers and gutter marks to compensate for
// horizontal scrolling.
diff --git a/js/codemirror-5.23.0/src/display/mode_state.js b/js/codemirror-5.39.0/src/display/mode_state.js
similarity index 67%
rename from js/codemirror-5.23.0/src/display/mode_state.js
rename to js/codemirror-5.39.0/src/display/mode_state.js
index 8c4c60b..5d8ebf2 100644
--- a/js/codemirror-5.23.0/src/display/mode_state.js
+++ b/js/codemirror-5.39.0/src/display/mode_state.js
@@ -1,7 +1,7 @@
-import { getMode } from "../modes"
+import { getMode } from "../modes.js"
-import { startWorker } from "./highlight_worker"
-import { regChange } from "./view_tracking"
+import { startWorker } from "./highlight_worker.js"
+import { regChange } from "./view_tracking.js"
// Used to get the editor into a consistent state again when options change.
@@ -15,7 +15,7 @@ export function resetModeState(cm) {
if (line.stateAfter) line.stateAfter = null
if (line.styles) line.styles = null
})
- cm.doc.frontier = cm.doc.first
+ cm.doc.modeFrontier = cm.doc.highlightFrontier = cm.doc.first
startWorker(cm, 100)
cm.state.modeGen++
if (cm.curOp) regChange(cm)
diff --git a/js/codemirror-5.23.0/src/display/operations.js b/js/codemirror-5.39.0/src/display/operations.js
similarity index 81%
rename from js/codemirror-5.23.0/src/display/operations.js
rename to js/codemirror-5.39.0/src/display/operations.js
index 30a63a6..5cc26d2 100644
--- a/js/codemirror-5.23.0/src/display/operations.js
+++ b/js/codemirror-5.39.0/src/display/operations.js
@@ -1,18 +1,16 @@
-import { clipPos } from "../line/pos"
-import { findMaxLine } from "../line/spans"
-import { displayWidth, measureChar, scrollGap } from "../measurement/position_measurement"
-import { signal } from "../util/event"
-import { activeElt } from "../util/dom"
-import { finishOperation, pushOperation } from "../util/operation_group"
-
-import { ensureFocus } from "./focus"
-import { alignHorizontally } from "./line_numbers"
-import { measureForScrollbars, updateScrollbars } from "./scrollbars"
-import { setScrollLeft } from "./scroll_events"
-import { restartBlink } from "./selection"
-import { maybeScrollWindow, scrollPosIntoView } from "./scrolling"
-import { DisplayUpdate, maybeClipScrollbars, postUpdateDisplay, setDocumentHeight, updateDisplayIfNeeded } from "./update_display"
-import { updateHeightsInViewport } from "./update_lines"
+import { clipPos } from "../line/pos.js"
+import { findMaxLine } from "../line/spans.js"
+import { displayWidth, measureChar, scrollGap } from "../measurement/position_measurement.js"
+import { signal } from "../util/event.js"
+import { activeElt } from "../util/dom.js"
+import { finishOperation, pushOperation } from "../util/operation_group.js"
+
+import { ensureFocus } from "./focus.js"
+import { measureForScrollbars, updateScrollbars } from "./scrollbars.js"
+import { restartBlink } from "./selection.js"
+import { maybeScrollWindow, scrollPosIntoView, setScrollLeft, setScrollTop } from "./scrolling.js"
+import { DisplayUpdate, maybeClipScrollbars, postUpdateDisplay, setDocumentHeight, updateDisplayIfNeeded } from "./update_display.js"
+import { updateHeightsInViewport } from "./update_lines.js"
// Operations are used to wrap a series of changes to the editor
// state in such a way that each change won't have to update the
@@ -104,7 +102,7 @@ function endOperation_R2(op) {
}
if (op.updatedDisplay || op.selectionChanged)
- op.preparedSelection = display.input.prepareSelection(op.focus)
+ op.preparedSelection = display.input.prepareSelection()
}
function endOperation_W2(op) {
@@ -117,7 +115,7 @@ function endOperation_W2(op) {
cm.display.maxLineChanged = false
}
- let takeFocus = op.focus && op.focus == activeElt() && (!document.hasFocus || document.hasFocus())
+ let takeFocus = op.focus && op.focus == activeElt()
if (op.preparedSelection)
cm.display.input.showSelection(op.preparedSelection, takeFocus)
if (op.updatedDisplay || op.startHeight != cm.doc.height)
@@ -142,22 +140,14 @@ function endOperation_finish(op) {
display.wheelStartX = display.wheelStartY = null
// Propagate the scroll position to the actual DOM scroller
- if (op.scrollTop != null && (display.scroller.scrollTop != op.scrollTop || op.forceScroll)) {
- doc.scrollTop = Math.max(0, Math.min(display.scroller.scrollHeight - display.scroller.clientHeight, op.scrollTop))
- display.scrollbars.setScrollTop(doc.scrollTop)
- display.scroller.scrollTop = doc.scrollTop
- }
- if (op.scrollLeft != null && (display.scroller.scrollLeft != op.scrollLeft || op.forceScroll)) {
- doc.scrollLeft = Math.max(0, Math.min(display.scroller.scrollWidth - display.scroller.clientWidth, op.scrollLeft))
- display.scrollbars.setScrollLeft(doc.scrollLeft)
- display.scroller.scrollLeft = doc.scrollLeft
- alignHorizontally(cm)
- }
+ if (op.scrollTop != null) setScrollTop(cm, op.scrollTop, op.forceScroll)
+
+ if (op.scrollLeft != null) setScrollLeft(cm, op.scrollLeft, true, true)
// If we need to scroll a specific position into view, do so.
if (op.scrollToPos) {
- let coords = scrollPosIntoView(cm, clipPos(doc, op.scrollToPos.from),
- clipPos(doc, op.scrollToPos.to), op.scrollToPos.margin)
- if (op.scrollToPos.isCursor && cm.state.focused) maybeScrollWindow(cm, coords)
+ let rect = scrollPosIntoView(cm, clipPos(doc, op.scrollToPos.from),
+ clipPos(doc, op.scrollToPos.to), op.scrollToPos.margin)
+ maybeScrollWindow(cm, rect)
}
// Fire events for markers that are hidden/unidden by editing or
diff --git a/js/codemirror-5.23.0/src/display/scroll_events.js b/js/codemirror-5.39.0/src/display/scroll_events.js
similarity index 76%
rename from js/codemirror-5.23.0/src/display/scroll_events.js
rename to js/codemirror-5.39.0/src/display/scroll_events.js
index e85d2a0..fbed426 100644
--- a/js/codemirror-5.23.0/src/display/scroll_events.js
+++ b/js/codemirror-5.39.0/src/display/scroll_events.js
@@ -1,31 +1,8 @@
-import { chrome, gecko, ie, mac, presto, safari, webkit } from "../util/browser"
-import { e_preventDefault } from "../util/event"
+import { chrome, gecko, ie, mac, presto, safari, webkit } from "../util/browser.js"
+import { e_preventDefault } from "../util/event.js"
-import { startWorker } from "./highlight_worker"
-import { alignHorizontally } from "./line_numbers"
-import { updateDisplaySimple} from "./update_display"
-
-// Sync the scrollable area and scrollbars, ensure the viewport
-// covers the visible area.
-export function setScrollTop(cm, val) {
- if (Math.abs(cm.doc.scrollTop - val) < 2) return
- cm.doc.scrollTop = val
- if (!gecko) updateDisplaySimple(cm, {top: val})
- if (cm.display.scroller.scrollTop != val) cm.display.scroller.scrollTop = val
- cm.display.scrollbars.setScrollTop(val)
- if (gecko) updateDisplaySimple(cm)
- startWorker(cm, 100)
-}
-// Sync scroller and scrollbar, ensure the gutter elements are
-// aligned.
-export function setScrollLeft(cm, val, isScroller) {
- if (isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) return
- val = Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth)
- cm.doc.scrollLeft = val
- alignHorizontally(cm)
- if (cm.display.scroller.scrollLeft != val) cm.display.scroller.scrollLeft = val
- cm.display.scrollbars.setScrollLeft(val)
-}
+import { updateDisplaySimple } from "./update_display.js"
+import { setScrollLeft, updateScrollTop } from "./scrolling.js"
// Since the delta values reported on mouse wheel events are
// unstandardized between browsers and even browser versions, and
@@ -94,8 +71,8 @@ export function onScrollWheel(cm, e) {
// better than glitching out.
if (dx && !gecko && !presto && wheelPixelsPerUnit != null) {
if (dy && canScrollY)
- setScrollTop(cm, Math.max(0, Math.min(scroll.scrollTop + dy * wheelPixelsPerUnit, scroll.scrollHeight - scroll.clientHeight)))
- setScrollLeft(cm, Math.max(0, Math.min(scroll.scrollLeft + dx * wheelPixelsPerUnit, scroll.scrollWidth - scroll.clientWidth)))
+ updateScrollTop(cm, Math.max(0, scroll.scrollTop + dy * wheelPixelsPerUnit))
+ setScrollLeft(cm, Math.max(0, scroll.scrollLeft + dx * wheelPixelsPerUnit))
// Only prevent default scrolling if vertical scrolling is
// actually possible. Otherwise, it causes vertical scroll
// jitter on OSX trackpads when deltaX is small and deltaY
diff --git a/js/codemirror-5.23.0/src/display/scrollbars.js b/js/codemirror-5.39.0/src/display/scrollbars.js
similarity index 89%
rename from js/codemirror-5.23.0/src/display/scrollbars.js
rename to js/codemirror-5.39.0/src/display/scrollbars.js
index 2026a3b..18ac121 100644
--- a/js/codemirror-5.23.0/src/display/scrollbars.js
+++ b/js/codemirror-5.39.0/src/display/scrollbars.js
@@ -1,11 +1,11 @@
-import { addClass, elt, rmClass } from "../util/dom"
-import { on } from "../util/event"
-import { scrollGap, paddingVert } from "../measurement/position_measurement"
-import { ie, ie_version, mac, mac_geMountainLion } from "../util/browser"
-import { updateHeightsInViewport } from "./update_lines"
-import { Delayed } from "../util/misc"
+import { addClass, elt, rmClass } from "../util/dom.js"
+import { on } from "../util/event.js"
+import { scrollGap, paddingVert } from "../measurement/position_measurement.js"
+import { ie, ie_version, mac, mac_geMountainLion } from "../util/browser.js"
+import { updateHeightsInViewport } from "./update_lines.js"
+import { Delayed } from "../util/misc.js"
-import { setScrollLeft, setScrollTop } from "./scroll_events"
+import { setScrollLeft, updateScrollTop } from "./scrolling.js"
// SCROLLBARS
@@ -32,6 +32,7 @@ class NativeScrollbars {
this.cm = cm
let vert = this.vert = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar")
let horiz = this.horiz = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar")
+ vert.tabIndex = horiz.tabIndex = -1
place(vert); place(horiz)
on(vert, "scroll", () => {
@@ -69,7 +70,7 @@ class NativeScrollbars {
this.horiz.style.left = measure.barLeft + "px"
let totalWidth = measure.viewWidth - measure.barLeft - (needsV ? sWidth : 0)
this.horiz.firstChild.style.width =
- (measure.scrollWidth - measure.clientWidth + totalWidth) + "px"
+ Math.max(0, measure.scrollWidth - measure.clientWidth + totalWidth) + "px"
} else {
this.horiz.style.display = ""
this.horiz.firstChild.style.width = "0"
@@ -85,12 +86,12 @@ class NativeScrollbars {
setScrollLeft(pos) {
if (this.horiz.scrollLeft != pos) this.horiz.scrollLeft = pos
- if (this.disableHoriz) this.enableZeroWidthBar(this.horiz, this.disableHoriz)
+ if (this.disableHoriz) this.enableZeroWidthBar(this.horiz, this.disableHoriz, "horiz")
}
setScrollTop(pos) {
if (this.vert.scrollTop != pos) this.vert.scrollTop = pos
- if (this.disableVert) this.enableZeroWidthBar(this.vert, this.disableVert)
+ if (this.disableVert) this.enableZeroWidthBar(this.vert, this.disableVert, "vert")
}
zeroWidthHack() {
@@ -101,17 +102,18 @@ class NativeScrollbars {
this.disableVert = new Delayed
}
- enableZeroWidthBar(bar, delay) {
+ enableZeroWidthBar(bar, delay, type) {
bar.style.pointerEvents = "auto"
function maybeDisable() {
// To find out whether the scrollbar is still visible, we
// check whether the element under the pixel in the bottom
- // left corner of the scrollbar box is the scrollbar box
+ // right corner of the scrollbar box is the scrollbar box
// itself (when the bar is still visible) or its filler child
// (when the bar is hidden). If it is still visible, we keep
// it enabled, if it's hidden, we disable pointer events.
let box = bar.getBoundingClientRect()
- let elt = document.elementFromPoint(box.left + 1, box.bottom - 1)
+ let elt = type == "vert" ? document.elementFromPoint(box.right - 1, (box.top + box.bottom) / 2)
+ : document.elementFromPoint((box.right + box.left) / 2, box.bottom - 1)
if (elt != bar) bar.style.pointerEvents = "none"
else delay.set(1000, maybeDisable)
}
@@ -184,7 +186,7 @@ export function initScrollbars(cm) {
node.setAttribute("cm-not-content", "true")
}, (pos, axis) => {
if (axis == "horizontal") setScrollLeft(cm, pos)
- else setScrollTop(cm, pos)
+ else updateScrollTop(cm, pos)
}, cm)
if (cm.display.scrollbars.addClass)
addClass(cm.display.wrapper, cm.display.scrollbars.addClass)
diff --git a/js/codemirror-5.39.0/src/display/scrolling.js b/js/codemirror-5.39.0/src/display/scrolling.js
new file mode 100644
index 0000000..26ec993
--- /dev/null
+++ b/js/codemirror-5.39.0/src/display/scrolling.js
@@ -0,0 +1,184 @@
+import { Pos } from "../line/pos.js"
+import { cursorCoords, displayHeight, displayWidth, estimateCoords, paddingTop, paddingVert, scrollGap, textHeight } from "../measurement/position_measurement.js"
+import { gecko, phantom } from "../util/browser.js"
+import { elt } from "../util/dom.js"
+import { signalDOMEvent } from "../util/event.js"
+
+import { startWorker } from "./highlight_worker.js"
+import { alignHorizontally } from "./line_numbers.js"
+import { updateDisplaySimple } from "./update_display.js"
+
+// SCROLLING THINGS INTO VIEW
+
+// If an editor sits on the top or bottom of the window, partially
+// scrolled out of view, this ensures that the cursor is visible.
+export function maybeScrollWindow(cm, rect) {
+ if (signalDOMEvent(cm, "scrollCursorIntoView")) return
+
+ let display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null
+ if (rect.top + box.top < 0) doScroll = true
+ else if (rect.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) doScroll = false
+ if (doScroll != null && !phantom) {
+ let scrollNode = elt("div", "\u200b", null, `position: absolute;
+ top: ${rect.top - display.viewOffset - paddingTop(cm.display)}px;
+ height: ${rect.bottom - rect.top + scrollGap(cm) + display.barHeight}px;
+ left: ${rect.left}px; width: ${Math.max(2, rect.right - rect.left)}px;`)
+ cm.display.lineSpace.appendChild(scrollNode)
+ scrollNode.scrollIntoView(doScroll)
+ cm.display.lineSpace.removeChild(scrollNode)
+ }
+}
+
+// Scroll a given position into view (immediately), verifying that
+// it actually became visible (as line heights are accurately
+// measured, the position of something may 'drift' during drawing).
+export function scrollPosIntoView(cm, pos, end, margin) {
+ if (margin == null) margin = 0
+ let rect
+ if (!cm.options.lineWrapping && pos == end) {
+ // Set pos and end to the cursor positions around the character pos sticks to
+ // If pos.sticky == "before", that is around pos.ch - 1, otherwise around pos.ch
+ // If pos == Pos(_, 0, "before"), pos and end are unchanged
+ pos = pos.ch ? Pos(pos.line, pos.sticky == "before" ? pos.ch - 1 : pos.ch, "after") : pos
+ end = pos.sticky == "before" ? Pos(pos.line, pos.ch + 1, "before") : pos
+ }
+ for (let limit = 0; limit < 5; limit++) {
+ let changed = false
+ let coords = cursorCoords(cm, pos)
+ let endCoords = !end || end == pos ? coords : cursorCoords(cm, end)
+ rect = {left: Math.min(coords.left, endCoords.left),
+ top: Math.min(coords.top, endCoords.top) - margin,
+ right: Math.max(coords.left, endCoords.left),
+ bottom: Math.max(coords.bottom, endCoords.bottom) + margin}
+ let scrollPos = calculateScrollPos(cm, rect)
+ let startTop = cm.doc.scrollTop, startLeft = cm.doc.scrollLeft
+ if (scrollPos.scrollTop != null) {
+ updateScrollTop(cm, scrollPos.scrollTop)
+ if (Math.abs(cm.doc.scrollTop - startTop) > 1) changed = true
+ }
+ if (scrollPos.scrollLeft != null) {
+ setScrollLeft(cm, scrollPos.scrollLeft)
+ if (Math.abs(cm.doc.scrollLeft - startLeft) > 1) changed = true
+ }
+ if (!changed) break
+ }
+ return rect
+}
+
+// Scroll a given set of coordinates into view (immediately).
+export function scrollIntoView(cm, rect) {
+ let scrollPos = calculateScrollPos(cm, rect)
+ if (scrollPos.scrollTop != null) updateScrollTop(cm, scrollPos.scrollTop)
+ if (scrollPos.scrollLeft != null) setScrollLeft(cm, scrollPos.scrollLeft)
+}
+
+// Calculate a new scroll position needed to scroll the given
+// rectangle into view. Returns an object with scrollTop and
+// scrollLeft properties. When these are undefined, the
+// vertical/horizontal position does not need to be adjusted.
+function calculateScrollPos(cm, rect) {
+ let display = cm.display, snapMargin = textHeight(cm.display)
+ if (rect.top < 0) rect.top = 0
+ let screentop = cm.curOp && cm.curOp.scrollTop != null ? cm.curOp.scrollTop : display.scroller.scrollTop
+ let screen = displayHeight(cm), result = {}
+ if (rect.bottom - rect.top > screen) rect.bottom = rect.top + screen
+ let docBottom = cm.doc.height + paddingVert(display)
+ let atTop = rect.top < snapMargin, atBottom = rect.bottom > docBottom - snapMargin
+ if (rect.top < screentop) {
+ result.scrollTop = atTop ? 0 : rect.top
+ } else if (rect.bottom > screentop + screen) {
+ let newTop = Math.min(rect.top, (atBottom ? docBottom : rect.bottom) - screen)
+ if (newTop != screentop) result.scrollTop = newTop
+ }
+
+ let screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft
+ let screenw = displayWidth(cm) - (cm.options.fixedGutter ? display.gutters.offsetWidth : 0)
+ let tooWide = rect.right - rect.left > screenw
+ if (tooWide) rect.right = rect.left + screenw
+ if (rect.left < 10)
+ result.scrollLeft = 0
+ else if (rect.left < screenleft)
+ result.scrollLeft = Math.max(0, rect.left - (tooWide ? 0 : 10))
+ else if (rect.right > screenw + screenleft - 3)
+ result.scrollLeft = rect.right + (tooWide ? 0 : 10) - screenw
+ return result
+}
+
+// Store a relative adjustment to the scroll position in the current
+// operation (to be applied when the operation finishes).
+export function addToScrollTop(cm, top) {
+ if (top == null) return
+ resolveScrollToPos(cm)
+ cm.curOp.scrollTop = (cm.curOp.scrollTop == null ? cm.doc.scrollTop : cm.curOp.scrollTop) + top
+}
+
+// Make sure that at the end of the operation the current cursor is
+// shown.
+export function ensureCursorVisible(cm) {
+ resolveScrollToPos(cm)
+ let cur = cm.getCursor()
+ cm.curOp.scrollToPos = {from: cur, to: cur, margin: cm.options.cursorScrollMargin}
+}
+
+export function scrollToCoords(cm, x, y) {
+ if (x != null || y != null) resolveScrollToPos(cm)
+ if (x != null) cm.curOp.scrollLeft = x
+ if (y != null) cm.curOp.scrollTop = y
+}
+
+export function scrollToRange(cm, range) {
+ resolveScrollToPos(cm)
+ cm.curOp.scrollToPos = range
+}
+
+// When an operation has its scrollToPos property set, and another
+// scroll action is applied before the end of the operation, this
+// 'simulates' scrolling that position into view in a cheap way, so
+// that the effect of intermediate scroll commands is not ignored.
+function resolveScrollToPos(cm) {
+ let range = cm.curOp.scrollToPos
+ if (range) {
+ cm.curOp.scrollToPos = null
+ let from = estimateCoords(cm, range.from), to = estimateCoords(cm, range.to)
+ scrollToCoordsRange(cm, from, to, range.margin)
+ }
+}
+
+export function scrollToCoordsRange(cm, from, to, margin) {
+ let sPos = calculateScrollPos(cm, {
+ left: Math.min(from.left, to.left),
+ top: Math.min(from.top, to.top) - margin,
+ right: Math.max(from.right, to.right),
+ bottom: Math.max(from.bottom, to.bottom) + margin
+ })
+ scrollToCoords(cm, sPos.scrollLeft, sPos.scrollTop)
+}
+
+// Sync the scrollable area and scrollbars, ensure the viewport
+// covers the visible area.
+export function updateScrollTop(cm, val) {
+ if (Math.abs(cm.doc.scrollTop - val) < 2) return
+ if (!gecko) updateDisplaySimple(cm, {top: val})
+ setScrollTop(cm, val, true)
+ if (gecko) updateDisplaySimple(cm)
+ startWorker(cm, 100)
+}
+
+export function setScrollTop(cm, val, forceScroll) {
+ val = 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)
+ if (cm.display.scroller.scrollTop != val) cm.display.scroller.scrollTop = val
+}
+
+// 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)
+ if ((isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) && !forceScroll) return
+ cm.doc.scrollLeft = val
+ alignHorizontally(cm)
+ if (cm.display.scroller.scrollLeft != val) cm.display.scroller.scrollLeft = val
+ cm.display.scrollbars.setScrollLeft(val)
+}
diff --git a/js/codemirror-5.23.0/src/display/selection.js b/js/codemirror-5.39.0/src/display/selection.js
similarity index 58%
rename from js/codemirror-5.23.0/src/display/selection.js
rename to js/codemirror-5.39.0/src/display/selection.js
index e3f9124..c658c0a 100644
--- a/js/codemirror-5.23.0/src/display/selection.js
+++ b/js/codemirror-5.39.0/src/display/selection.js
@@ -1,21 +1,21 @@
-import { Pos } from "../line/pos"
-import { visualLine } from "../line/spans"
-import { getLine } from "../line/utils_line"
-import { charCoords, cursorCoords, displayWidth, paddingH } from "../measurement/position_measurement"
-import { getOrder, iterateBidiSections } from "../util/bidi"
-import { elt } from "../util/dom"
+import { Pos } from "../line/pos.js"
+import { visualLine } from "../line/spans.js"
+import { getLine } from "../line/utils_line.js"
+import { charCoords, cursorCoords, displayWidth, paddingH, wrappedLineExtentChar } from "../measurement/position_measurement.js"
+import { getOrder, iterateBidiSections } from "../util/bidi.js"
+import { elt } from "../util/dom.js"
export function updateSelection(cm) {
cm.display.input.showSelection(cm.display.input.prepareSelection())
}
-export function prepareSelection(cm, primary) {
+export function prepareSelection(cm, primary = true) {
let doc = cm.doc, result = {}
let curFragment = result.cursors = document.createDocumentFragment()
let selFragment = result.selection = document.createDocumentFragment()
for (let i = 0; i < doc.sel.ranges.length; i++) {
- if (primary === false && i == doc.sel.primIndex) continue
+ if (!primary && i == doc.sel.primIndex) continue
let range = doc.sel.ranges[i]
if (range.from().line >= cm.display.viewTo || range.to().line < cm.display.viewFrom) continue
let collapsed = range.empty()
@@ -46,12 +46,15 @@ export function drawSelectionCursor(cm, head, output) {
}
}
+function cmpCoords(a, b) { return a.top - b.top || a.left - b.left }
+
// Draws the given range as a highlighted selection
function drawSelectionRange(cm, range, output) {
let display = cm.display, doc = cm.doc
let fragment = document.createDocumentFragment()
let padding = paddingH(cm.display), leftSide = padding.left
let rightSide = Math.max(display.sizerWidth, displayWidth(cm) - display.sizer.offsetLeft) - padding.right
+ let docLTR = doc.direction == "ltr"
function add(left, top, width, bottom) {
if (top < 0) top = 0
@@ -70,30 +73,49 @@ function drawSelectionRange(cm, range, output) {
return charCoords(cm, Pos(line, ch), "div", lineObj, bias)
}
- iterateBidiSections(getOrder(lineObj), fromArg || 0, toArg == null ? lineLen : toArg, (from, to, dir) => {
- let leftPos = coords(from, "left"), rightPos, left, right
- if (from == to) {
- rightPos = leftPos
- left = right = leftPos.left
- } else {
- rightPos = coords(to - 1, "right")
- if (dir == "rtl") { let tmp = leftPos; leftPos = rightPos; rightPos = tmp }
- left = leftPos.left
- right = rightPos.right
- }
- if (fromArg == null && from == 0) left = leftSide
- if (rightPos.top - leftPos.top > 3) { // Different lines, draw top part
- add(left, leftPos.top, null, leftPos.bottom)
- left = leftSide
- if (leftPos.bottom < rightPos.top) add(left, leftPos.bottom, null, rightPos.top)
+ function wrapX(pos, dir, side) {
+ let extent = wrappedLineExtentChar(cm, lineObj, null, pos)
+ let prop = (dir == "ltr") == (side == "after") ? "left" : "right"
+ let ch = side == "after" ? extent.begin : extent.end - (/\s/.test(lineObj.text.charAt(extent.end - 1)) ? 2 : 1)
+ return coords(ch, prop)[prop]
+ }
+
+ let order = getOrder(lineObj, doc.direction)
+ iterateBidiSections(order, fromArg || 0, toArg == null ? lineLen : toArg, (from, to, dir, i) => {
+ let ltr = dir == "ltr"
+ let fromPos = coords(from, ltr ? "left" : "right")
+ let toPos = coords(to - 1, ltr ? "right" : "left")
+
+ let openStart = fromArg == null && from == 0, openEnd = toArg == null && to == lineLen
+ let first = i == 0, last = !order || i == order.length - 1
+ if (toPos.top - fromPos.top <= 3) { // Single line
+ let openLeft = (docLTR ? openStart : openEnd) && first
+ let openRight = (docLTR ? openEnd : openStart) && last
+ let left = openLeft ? leftSide : (ltr ? fromPos : toPos).left
+ let right = openRight ? rightSide : (ltr ? toPos : fromPos).right
+ add(left, fromPos.top, right - left, fromPos.bottom)
+ } else { // Multiple lines
+ let topLeft, topRight, botLeft, botRight
+ if (ltr) {
+ topLeft = docLTR && openStart && first ? leftSide : fromPos.left
+ topRight = docLTR ? rightSide : wrapX(from, dir, "before")
+ botLeft = docLTR ? leftSide : wrapX(to, dir, "after")
+ botRight = docLTR && openEnd && last ? rightSide : toPos.right
+ } else {
+ topLeft = !docLTR ? leftSide : wrapX(from, dir, "before")
+ topRight = !docLTR && openStart && first ? rightSide : fromPos.right
+ botLeft = !docLTR && openEnd && last ? leftSide : toPos.left
+ botRight = !docLTR ? rightSide : wrapX(to, dir, "after")
+ }
+ add(topLeft, fromPos.top, topRight - topLeft, fromPos.bottom)
+ if (fromPos.bottom < toPos.top) add(leftSide, fromPos.bottom, null, toPos.top)
+ add(botLeft, toPos.top, botRight - botLeft, toPos.bottom)
}
- if (toArg == null && to == lineLen) right = rightSide
- if (!start || leftPos.top < start.top || leftPos.top == start.top && leftPos.left < start.left)
- start = leftPos
- if (!end || rightPos.bottom > end.bottom || rightPos.bottom == end.bottom && rightPos.right > end.right)
- end = rightPos
- if (left < leftSide + 1) left = leftSide
- add(left, rightPos.top, right - left, rightPos.bottom)
+
+ if (!start || cmpCoords(fromPos, start) < 0) start = fromPos
+ if (cmpCoords(toPos, start) < 0) start = toPos
+ if (!end || cmpCoords(fromPos, end) < 0) end = fromPos
+ if (cmpCoords(toPos, end) < 0) end = toPos
})
return {start: start, end: end}
}
diff --git a/js/codemirror-5.23.0/src/display/update_display.js b/js/codemirror-5.39.0/src/display/update_display.js
similarity index 82%
rename from js/codemirror-5.23.0/src/display/update_display.js
rename to js/codemirror-5.39.0/src/display/update_display.js
index 17d5a06..86c7132 100644
--- a/js/codemirror-5.23.0/src/display/update_display.js
+++ b/js/codemirror-5.39.0/src/display/update_display.js
@@ -1,19 +1,19 @@
-import { sawCollapsedSpans } from "../line/saw_special_spans"
-import { heightAtLine, visualLineEndNo, visualLineNo } from "../line/spans"
-import { getLine, lineNumberFor } from "../line/utils_line"
-import { displayHeight, displayWidth, getDimensions, paddingVert, scrollGap } from "../measurement/position_measurement"
-import { mac, webkit } from "../util/browser"
-import { activeElt, removeChildren } from "../util/dom"
-import { hasHandler, signal } from "../util/event"
-import { indexOf } from "../util/misc"
-
-import { buildLineElement, updateLineForChanges } from "./update_line"
-import { startWorker } from "./highlight_worker"
-import { maybeUpdateLineNumberWidth } from "./line_numbers"
-import { measureForScrollbars, updateScrollbars } from "./scrollbars"
-import { updateSelection } from "./selection"
-import { updateHeightsInViewport, visibleLines } from "./update_lines"
-import { adjustView, countDirtyView, resetView } from "./view_tracking"
+import { sawCollapsedSpans } from "../line/saw_special_spans.js"
+import { heightAtLine, visualLineEndNo, visualLineNo } from "../line/spans.js"
+import { getLine, lineNumberFor } from "../line/utils_line.js"
+import { displayHeight, displayWidth, getDimensions, paddingVert, scrollGap } from "../measurement/position_measurement.js"
+import { mac, webkit } from "../util/browser.js"
+import { activeElt, removeChildren, contains } from "../util/dom.js"
+import { hasHandler, signal } from "../util/event.js"
+import { indexOf } from "../util/misc.js"
+
+import { buildLineElement, updateLineForChanges } from "./update_line.js"
+import { startWorker } from "./highlight_worker.js"
+import { maybeUpdateLineNumberWidth } from "./line_numbers.js"
+import { measureForScrollbars, updateScrollbars } from "./scrollbars.js"
+import { updateSelection } from "./selection.js"
+import { updateHeightsInViewport, visibleLines } from "./update_lines.js"
+import { adjustView, countDirtyView, resetView } from "./view_tracking.js"
// DISPLAY DRAWING
@@ -54,6 +54,36 @@ export function maybeClipScrollbars(cm) {
}
}
+function selectionSnapshot(cm) {
+ if (cm.hasFocus()) return null
+ let active = activeElt()
+ if (!active || !contains(cm.display.lineDiv, active)) return null
+ let result = {activeElt: active}
+ if (window.getSelection) {
+ let sel = window.getSelection()
+ if (sel.anchorNode && sel.extend && contains(cm.display.lineDiv, sel.anchorNode)) {
+ result.anchorNode = sel.anchorNode
+ result.anchorOffset = sel.anchorOffset
+ result.focusNode = sel.focusNode
+ result.focusOffset = sel.focusOffset
+ }
+ }
+ return result
+}
+
+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)) {
+ let sel = window.getSelection(), range = document.createRange()
+ range.setEnd(snapshot.anchorNode, snapshot.anchorOffset)
+ range.collapse(false)
+ sel.removeAllRanges()
+ sel.addRange(range)
+ sel.extend(snapshot.focusNode, snapshot.focusOffset)
+ }
+}
+
// Does the actual updating of the line display. Bails out
// (returning false) when there is nothing to be done and forced is
// false.
@@ -103,14 +133,14 @@ export function updateDisplayIfNeeded(cm, update) {
// For big changes, we hide the enclosing element during the
// update, since that speeds up the operations on most browsers.
- let focused = activeElt()
+ let selSnapshot = selectionSnapshot(cm)
if (toUpdate > 4) display.lineDiv.style.display = "none"
patchDisplay(cm, display.updateLineNumbers, update.dims)
if (toUpdate > 4) display.lineDiv.style.display = ""
display.renderedView = display.view
// There might have been a widget with a focused element that got
// hidden or updated, if so re-focus it.
- if (focused && activeElt() != focused && focused.offsetHeight) focused.focus()
+ restoreSelection(selSnapshot)
// Prevent selection and cursors from interfering with the scroll
// width and height.
@@ -149,6 +179,7 @@ export function postUpdateDisplay(cm, update) {
updateSelection(cm)
updateScrollbars(cm, barMeasure)
setDocumentHeight(cm, barMeasure)
+ update.force = false
}
update.signal(cm, "update", cm)
diff --git a/js/codemirror-5.23.0/src/display/update_line.js b/js/codemirror-5.39.0/src/display/update_line.js
similarity index 91%
rename from js/codemirror-5.23.0/src/display/update_line.js
rename to js/codemirror-5.39.0/src/display/update_line.js
index 007eba7..db9df26 100644
--- a/js/codemirror-5.23.0/src/display/update_line.js
+++ b/js/codemirror-5.39.0/src/display/update_line.js
@@ -1,8 +1,8 @@
-import { buildLineContent } from "../line/line_data"
-import { lineNumberFor } from "../line/utils_line"
-import { ie, ie_version } from "../util/browser"
-import { elt } from "../util/dom"
-import { signalLater } from "../util/operation_group"
+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 { signalLater } from "../util/operation_group.js"
// When an aspect of a line changes, a string is added to
// lineView.changes. This updates the relevant part of the line's
@@ -12,7 +12,7 @@ export function updateLineForChanges(cm, lineView, lineN, dims) {
let type = lineView.changes[j]
if (type == "text") updateLineText(cm, lineView)
else if (type == "gutter") updateLineGutter(cm, lineView, lineN, dims)
- else if (type == "class") updateLineClasses(lineView)
+ else if (type == "class") updateLineClasses(cm, lineView)
else if (type == "widget") updateLineWidgets(cm, lineView, dims)
}
lineView.changes = null
@@ -31,7 +31,7 @@ function ensureLineWrapped(lineView) {
return lineView.node
}
-function updateLineBackground(lineView) {
+function updateLineBackground(cm, lineView) {
let cls = lineView.bgClass ? lineView.bgClass + " " + (lineView.line.bgClass || "") : lineView.line.bgClass
if (cls) cls += " CodeMirror-linebackground"
if (lineView.background) {
@@ -40,6 +40,7 @@ function updateLineBackground(lineView) {
} else if (cls) {
let wrap = ensureLineWrapped(lineView)
lineView.background = wrap.insertBefore(elt("div", null, cls), wrap.firstChild)
+ cm.display.input.setUneditable(lineView.background)
}
}
@@ -67,14 +68,14 @@ function updateLineText(cm, lineView) {
if (built.bgClass != lineView.bgClass || built.textClass != lineView.textClass) {
lineView.bgClass = built.bgClass
lineView.textClass = built.textClass
- updateLineClasses(lineView)
+ updateLineClasses(cm, lineView)
} else if (cls) {
lineView.text.className = cls
}
}
-function updateLineClasses(lineView) {
- updateLineBackground(lineView)
+function updateLineClasses(cm, lineView) {
+ updateLineBackground(cm, lineView)
if (lineView.line.wrapClass)
ensureLineWrapped(lineView).className = lineView.line.wrapClass
else if (lineView.node != lineView.text)
@@ -96,6 +97,7 @@ function updateLineGutter(cm, lineView, lineN, dims) {
let wrap = ensureLineWrapped(lineView)
lineView.gutterBackground = elt("div", null, "CodeMirror-gutter-background " + lineView.line.gutterClass,
`left: ${cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth}px; width: ${dims.gutterTotalWidth}px`)
+ cm.display.input.setUneditable(lineView.gutterBackground)
wrap.insertBefore(lineView.gutterBackground, lineView.text)
}
let markers = lineView.line.gutterMarkers
@@ -137,7 +139,7 @@ export function buildLineElement(cm, lineView, lineN, dims) {
if (built.bgClass) lineView.bgClass = built.bgClass
if (built.textClass) lineView.textClass = built.textClass
- updateLineClasses(lineView)
+ updateLineClasses(cm, lineView)
updateLineGutter(cm, lineView, lineN, dims)
insertLineWidgets(cm, lineView, dims)
return lineView.node
diff --git a/js/codemirror-5.23.0/src/display/update_lines.js b/js/codemirror-5.39.0/src/display/update_lines.js
similarity index 89%
rename from js/codemirror-5.23.0/src/display/update_lines.js
rename to js/codemirror-5.39.0/src/display/update_lines.js
index 095cdde..7f06018 100644
--- a/js/codemirror-5.23.0/src/display/update_lines.js
+++ b/js/codemirror-5.39.0/src/display/update_lines.js
@@ -1,7 +1,7 @@
-import { heightAtLine } from "../line/spans"
-import { getLine, lineAtHeight, updateLineHeight } from "../line/utils_line"
-import { paddingTop, textHeight } from "../measurement/position_measurement"
-import { ie, ie_version } from "../util/browser"
+import { heightAtLine } from "../line/spans.js"
+import { getLine, lineAtHeight, updateLineHeight } from "../line/utils_line.js"
+import { paddingTop, textHeight } from "../measurement/position_measurement.js"
+import { ie, ie_version } from "../util/browser.js"
// Read the actual heights of the rendered lines, and update their
// stored heights to match.
@@ -21,7 +21,7 @@ export function updateHeightsInViewport(cm) {
}
let diff = cur.line.height - height
if (height < 2) height = textHeight(display)
- if (diff > .001 || diff < -.001) {
+ if (diff > .005 || diff < -.005) {
updateLineHeight(cur.line, height)
updateWidgetHeight(cur.line)
if (cur.rest) for (let j = 0; j < cur.rest.length; j++)
@@ -33,8 +33,10 @@ export function updateHeightsInViewport(cm) {
// Read and store the height of line widgets associated with the
// given line.
function updateWidgetHeight(line) {
- if (line.widgets) for (let i = 0; i < line.widgets.length; ++i)
- line.widgets[i].height = line.widgets[i].node.parentNode.offsetHeight
+ if (line.widgets) for (let i = 0; i < line.widgets.length; ++i) {
+ let w = line.widgets[i], parent = w.node.parentNode
+ if (parent) w.height = parent.offsetHeight
+ }
}
// Compute the lines that are visible in a given viewport (defaults
diff --git a/js/codemirror-5.23.0/src/display/view_tracking.js b/js/codemirror-5.39.0/src/display/view_tracking.js
similarity index 95%
rename from js/codemirror-5.23.0/src/display/view_tracking.js
rename to js/codemirror-5.39.0/src/display/view_tracking.js
index b9abd2f..41464f2 100644
--- a/js/codemirror-5.23.0/src/display/view_tracking.js
+++ b/js/codemirror-5.39.0/src/display/view_tracking.js
@@ -1,8 +1,8 @@
-import { buildViewArray } from "../line/line_data"
-import { sawCollapsedSpans } from "../line/saw_special_spans"
-import { visualLineEndNo, visualLineNo } from "../line/spans"
-import { findViewIndex } from "../measurement/position_measurement"
-import { indexOf } from "../util/misc"
+import { buildViewArray } from "../line/line_data.js"
+import { sawCollapsedSpans } from "../line/saw_special_spans.js"
+import { visualLineEndNo, visualLineNo } from "../line/spans.js"
+import { findViewIndex } from "../measurement/position_measurement.js"
+import { indexOf } from "../util/misc.js"
// Updates the display.view data structure for a given change to the
// document. From and to are in pre-change coordinates. Lendiff is
diff --git a/js/codemirror-5.23.0/src/edit/CodeMirror.js b/js/codemirror-5.39.0/src/edit/CodeMirror.js
similarity index 85%
rename from js/codemirror-5.23.0/src/edit/CodeMirror.js
rename to js/codemirror-5.39.0/src/edit/CodeMirror.js
index 3c482c5..6d3084f 100644
--- a/js/codemirror-5.23.0/src/edit/CodeMirror.js
+++ b/js/codemirror-5.39.0/src/edit/CodeMirror.js
@@ -1,27 +1,28 @@
-import { Display } from "../display/Display"
-import { onFocus, onBlur } from "../display/focus"
-import { setGuttersForLineNumbers, updateGutters } from "../display/gutters"
-import { maybeUpdateLineNumberWidth } from "../display/line_numbers"
-import { endOperation, operation, startOperation } from "../display/operations"
-import { initScrollbars } from "../display/scrollbars"
-import { onScrollWheel, setScrollLeft, setScrollTop } from "../display/scroll_events"
-import { clipPos, Pos } from "../line/pos"
-import { posFromMouse } from "../measurement/position_measurement"
-import { eventInWidget } from "../measurement/widgets"
-import Doc from "../model/Doc"
-import { attachDoc } from "../model/document_data"
-import { Range } from "../model/selection"
-import { extendSelection } from "../model/selection_updates"
-import { captureRightClick, ie, ie_version, mobile, webkit } from "../util/browser"
-import { e_preventDefault, e_stop, on, signal, signalDOMEvent } from "../util/event"
-import { bind, copyObj, Delayed } from "../util/misc"
-
-import { clearDragCursor, onDragOver, onDragStart, onDrop } from "./drop_events"
-import { ensureGlobalHandlers } from "./global_events"
-import { onKeyDown, onKeyPress, onKeyUp } from "./key_events"
-import { clickInGutter, onContextMenu, onMouseDown } from "./mouse_events"
-import { themeChanged } from "./utils"
-import { defaults, optionHandlers, Init } from "./options"
+import { Display } from "../display/Display.js"
+import { onFocus, onBlur } from "../display/focus.js"
+import { setGuttersForLineNumbers, updateGutters } from "../display/gutters.js"
+import { maybeUpdateLineNumberWidth } from "../display/line_numbers.js"
+import { endOperation, operation, startOperation } from "../display/operations.js"
+import { initScrollbars } from "../display/scrollbars.js"
+import { onScrollWheel } from "../display/scroll_events.js"
+import { setScrollLeft, updateScrollTop } from "../display/scrolling.js"
+import { clipPos, Pos } from "../line/pos.js"
+import { posFromMouse } from "../measurement/position_measurement.js"
+import { eventInWidget } from "../measurement/widgets.js"
+import Doc from "../model/Doc.js"
+import { attachDoc } from "../model/document_data.js"
+import { Range } from "../model/selection.js"
+import { extendSelection } from "../model/selection_updates.js"
+import { captureRightClick, ie, ie_version, mobile, webkit } from "../util/browser.js"
+import { e_preventDefault, e_stop, on, signal, signalDOMEvent } from "../util/event.js"
+import { bind, copyObj, Delayed } from "../util/misc.js"
+
+import { clearDragCursor, onDragOver, onDragStart, onDrop } from "./drop_events.js"
+import { ensureGlobalHandlers } from "./global_events.js"
+import { onKeyDown, onKeyPress, onKeyUp } from "./key_events.js"
+import { clickInGutter, onContextMenu, onMouseDown } from "./mouse_events.js"
+import { themeChanged } from "./utils.js"
+import { defaults, optionHandlers, Init } from "./options.js"
// A CodeMirror instance represents an editor. This is the object
// that user code is usually dealing with.
@@ -35,7 +36,8 @@ export function CodeMirror(place, options) {
setGuttersForLineNumbers(options)
let doc = options.value
- if (typeof doc == "string") doc = new Doc(doc, options.mode, null, options.lineSeparator)
+ if (typeof doc == "string") doc = new Doc(doc, options.mode, null, options.lineSeparator, options.direction)
+ else if (options.mode) doc.modeOption = options.mode
this.doc = doc
let input = new CodeMirror.inputStyles[options.inputStyle](this)
@@ -142,7 +144,7 @@ function registerEventHandlers(cm) {
return dx * dx + dy * dy > 20 * 20
}
on(d.scroller, "touchstart", e => {
- if (!signalDOMEvent(cm, e) && !isMouseLikeTouchEvent(e)) {
+ if (!signalDOMEvent(cm, e) && !isMouseLikeTouchEvent(e) && !clickInGutter(cm, e)) {
d.input.ensurePolled()
clearTimeout(touchFinished)
let now = +new Date
@@ -180,7 +182,7 @@ function registerEventHandlers(cm) {
// area, ensure viewport is updated when scrolling.
on(d.scroller, "scroll", () => {
if (d.scroller.clientHeight) {
- setScrollTop(cm, d.scroller.scrollTop)
+ updateScrollTop(cm, d.scroller.scrollTop)
setScrollLeft(cm, d.scroller.scrollLeft, true)
signal(cm, "scroll", cm)
}
diff --git a/js/codemirror-5.23.0/src/edit/commands.js b/js/codemirror-5.39.0/src/edit/commands.js
similarity index 84%
rename from js/codemirror-5.23.0/src/edit/commands.js
rename to js/codemirror-5.39.0/src/edit/commands.js
index 0b0125d..3916b12 100644
--- a/js/codemirror-5.23.0/src/edit/commands.js
+++ b/js/codemirror-5.39.0/src/edit/commands.js
@@ -1,13 +1,14 @@
-import { deleteNearSelection } from "./deleteNearSelection"
-import { runInOp } from "../display/operations"
-import { ensureCursorVisible } from "../display/scrolling"
-import { clipPos, Pos } from "../line/pos"
-import { collapsedSpanAtEnd, visualLine } from "../line/spans"
-import { getLine, lineNo } from "../line/utils_line"
-import { Range } from "../model/selection"
-import { selectAll } from "../model/selection_updates"
-import { countColumn, sel_dontScroll, sel_move, spaceStr } from "../util/misc"
-import { getOrder, lineLeft, lineRight } from "../util/bidi"
+import { deleteNearSelection } from "./deleteNearSelection.js"
+import { runInOp } from "../display/operations.js"
+import { ensureCursorVisible } from "../display/scrolling.js"
+import { endOfLine } from "../input/movement.js"
+import { clipPos, Pos } from "../line/pos.js"
+import { visualLine, visualLineEnd } from "../line/spans.js"
+import { getLine, lineNo } from "../line/utils_line.js"
+import { Range } from "../model/selection.js"
+import { selectAll } from "../model/selection_updates.js"
+import { countColumn, sel_dontScroll, sel_move, spaceStr } from "../util/misc.js"
+import { getOrder } from "../util/bidi.js"
// Commands are parameter-less actions that can be performed on an
// editor, mostly used for keybindings.
@@ -58,15 +59,15 @@ export let commands = {
{origin: "+move", bias: -1}
),
goLineRight: cm => cm.extendSelectionsBy(range => {
- let top = cm.charCoords(range.head, "div").top + 5
+ let top = cm.cursorCoords(range.head, "div").top + 5
return cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div")
}, sel_move),
goLineLeft: cm => cm.extendSelectionsBy(range => {
- let top = cm.charCoords(range.head, "div").top + 5
+ let top = cm.cursorCoords(range.head, "div").top + 5
return cm.coordsChar({left: 0, top: top}, "div")
}, sel_move),
goLineLeftSmart: cm => cm.extendSelectionsBy(range => {
- let top = cm.charCoords(range.head, "div").top + 5
+ let top = cm.cursorCoords(range.head, "div").top + 5
let pos = cm.coordsChar({left: 0, top: top}, "div")
if (pos.ch < cm.getLine(pos.line).search(/\S/)) return lineStartSmart(cm, range.head)
return pos
@@ -156,28 +157,22 @@ function lineStart(cm, lineN) {
let line = getLine(cm.doc, lineN)
let visual = visualLine(line)
if (visual != line) lineN = lineNo(visual)
- let order = getOrder(visual)
- let ch = !order ? 0 : order[0].level % 2 ? lineRight(visual) : lineLeft(visual)
- return Pos(lineN, ch)
+ return endOfLine(true, cm, visual, lineN, 1)
}
function lineEnd(cm, lineN) {
- let merged, line = getLine(cm.doc, lineN)
- while (merged = collapsedSpanAtEnd(line)) {
- line = merged.find(1, true).line
- lineN = null
- }
- let order = getOrder(line)
- let ch = !order ? line.text.length : order[0].level % 2 ? lineLeft(line) : lineRight(line)
- return Pos(lineN == null ? lineNo(line) : lineN, ch)
+ let line = getLine(cm.doc, lineN)
+ let visual = visualLineEnd(line)
+ if (visual != line) lineN = lineNo(visual)
+ return endOfLine(true, cm, line, lineN, -1)
}
function lineStartSmart(cm, pos) {
let start = lineStart(cm, pos.line)
let line = getLine(cm.doc, start.line)
- let order = getOrder(line)
+ let order = getOrder(line, cm.doc.direction)
if (!order || order[0].level == 0) {
let firstNonWS = Math.max(0, line.text.search(/\S/))
let inWS = pos.line == start.line && pos.ch <= firstNonWS && pos.ch
- return Pos(start.line, inWS ? 0 : firstNonWS)
+ return Pos(start.line, inWS ? 0 : firstNonWS, start.sticky)
}
return start
}
diff --git a/js/codemirror-5.23.0/src/edit/deleteNearSelection.js b/js/codemirror-5.39.0/src/edit/deleteNearSelection.js
similarity index 77%
rename from js/codemirror-5.23.0/src/edit/deleteNearSelection.js
rename to js/codemirror-5.39.0/src/edit/deleteNearSelection.js
index 5a9bd2c..82e331a 100644
--- a/js/codemirror-5.23.0/src/edit/deleteNearSelection.js
+++ b/js/codemirror-5.39.0/src/edit/deleteNearSelection.js
@@ -1,8 +1,8 @@
-import { runInOp } from "../display/operations"
-import { ensureCursorVisible } from "../display/scrolling"
-import { cmp } from "../line/pos"
-import { replaceRange } from "../model/changes"
-import { lst } from "../util/misc"
+import { runInOp } from "../display/operations.js"
+import { ensureCursorVisible } from "../display/scrolling.js"
+import { cmp } from "../line/pos.js"
+import { replaceRange } from "../model/changes.js"
+import { lst } from "../util/misc.js"
// Helper for deleting text near the selection(s), used to implement
// backspace, delete, and similar functionality.
diff --git a/js/codemirror-5.23.0/src/edit/drop_events.js b/js/codemirror-5.39.0/src/edit/drop_events.js
similarity index 87%
rename from js/codemirror-5.23.0/src/edit/drop_events.js
rename to js/codemirror-5.39.0/src/edit/drop_events.js
index 43e996f..12c760f 100644
--- a/js/codemirror-5.23.0/src/edit/drop_events.js
+++ b/js/codemirror-5.39.0/src/edit/drop_events.js
@@ -1,16 +1,16 @@
-import { drawSelectionCursor } from "../display/selection"
-import { operation } from "../display/operations"
-import { clipPos } from "../line/pos"
-import { posFromMouse } from "../measurement/position_measurement"
-import { eventInWidget } from "../measurement/widgets"
-import { makeChange, replaceRange } from "../model/changes"
-import { changeEnd } from "../model/change_measurement"
-import { simpleSelection } from "../model/selection"
-import { setSelectionNoUndo, setSelectionReplaceHistory } from "../model/selection_updates"
-import { ie, presto, safari } from "../util/browser"
-import { elt, removeChildrenAndAdd } from "../util/dom"
-import { e_preventDefault, e_stop, signalDOMEvent } from "../util/event"
-import { indexOf } from "../util/misc"
+import { drawSelectionCursor } from "../display/selection.js"
+import { operation } from "../display/operations.js"
+import { clipPos } from "../line/pos.js"
+import { posFromMouse } from "../measurement/position_measurement.js"
+import { eventInWidget } from "../measurement/widgets.js"
+import { makeChange, replaceRange } from "../model/changes.js"
+import { changeEnd } from "../model/change_measurement.js"
+import { simpleSelection } from "../model/selection.js"
+import { setSelectionNoUndo, setSelectionReplaceHistory } from "../model/selection_updates.js"
+import { ie, presto, safari } from "../util/browser.js"
+import { elt, removeChildrenAndAdd } from "../util/dom.js"
+import { e_preventDefault, e_stop, signalDOMEvent } from "../util/event.js"
+import { indexOf } from "../util/misc.js"
// Kludge to work around strange IE behavior where it'll sometimes
// re-fire a series of drag-related events right after the drop (#1551)
diff --git a/js/codemirror-5.23.0/src/edit/fromTextArea.js b/js/codemirror-5.39.0/src/edit/fromTextArea.js
similarity index 91%
rename from js/codemirror-5.23.0/src/edit/fromTextArea.js
rename to js/codemirror-5.39.0/src/edit/fromTextArea.js
index 5d92083..92498c1 100644
--- a/js/codemirror-5.23.0/src/edit/fromTextArea.js
+++ b/js/codemirror-5.39.0/src/edit/fromTextArea.js
@@ -1,7 +1,7 @@
-import { CodeMirror } from "./CodeMirror"
-import { activeElt } from "../util/dom"
-import { off, on } from "../util/event"
-import { copyObj } from "../util/misc"
+import { CodeMirror } from "./CodeMirror.js"
+import { activeElt } from "../util/dom.js"
+import { off, on } from "../util/event.js"
+import { copyObj } from "../util/misc.js"
export function fromTextArea(textarea, options) {
options = options ? copyObj(options) : {}
diff --git a/js/codemirror-5.23.0/src/edit/global_events.js b/js/codemirror-5.39.0/src/edit/global_events.js
similarity index 78%
rename from js/codemirror-5.23.0/src/edit/global_events.js
rename to js/codemirror-5.39.0/src/edit/global_events.js
index dd7d185..d34fabe 100644
--- a/js/codemirror-5.23.0/src/edit/global_events.js
+++ b/js/codemirror-5.39.0/src/edit/global_events.js
@@ -1,13 +1,13 @@
-import { onBlur } from "../display/focus"
-import { on } from "../util/event"
+import { onBlur } from "../display/focus.js"
+import { on } from "../util/event.js"
// These must be handled carefully, because naively registering a
// handler for each editor will cause the editors to never be
// garbage collected.
function forEachCodeMirror(f) {
- if (!document.body.getElementsByClassName) return
- let byClass = document.body.getElementsByClassName("CodeMirror")
+ if (!document.getElementsByClassName) return
+ let byClass = document.getElementsByClassName("CodeMirror")
for (let i = 0; i < byClass.length; i++) {
let cm = byClass[i].CodeMirror
if (cm) f(cm)
@@ -35,8 +35,6 @@ function registerGlobalHandlers() {
// Called when the window resizes
function onResize(cm) {
let d = cm.display
- if (d.lastWrapHeight == d.wrapper.clientHeight && d.lastWrapWidth == d.wrapper.clientWidth)
- return
// Might be a text scaling operation, clear size caches.
d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null
d.scrollbarsClipped = false
diff --git a/js/codemirror-5.23.0/src/edit/key_events.js b/js/codemirror-5.39.0/src/edit/key_events.js
similarity index 80%
rename from js/codemirror-5.23.0/src/edit/key_events.js
rename to js/codemirror-5.39.0/src/edit/key_events.js
index 8e69547..f0521d0 100644
--- a/js/codemirror-5.23.0/src/edit/key_events.js
+++ b/js/codemirror-5.39.0/src/edit/key_events.js
@@ -1,14 +1,14 @@
-import { signalLater } from "../util/operation_group"
-import { restartBlink } from "../display/selection"
-import { isModifierKey, keyName, lookupKey } from "../input/keymap"
-import { eventInWidget } from "../measurement/widgets"
-import { ie, ie_version, mac, presto } from "../util/browser"
-import { activeElt, addClass, rmClass } from "../util/dom"
-import { e_preventDefault, off, on, signalDOMEvent } from "../util/event"
-import { hasCopyEvent } from "../util/feature_detection"
-import { Delayed, Pass } from "../util/misc"
-
-import { commands } from "./commands"
+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 { activeElt, addClass, rmClass } from "../util/dom.js"
+import { e_preventDefault, off, on, signalDOMEvent } from "../util/event.js"
+import { hasCopyEvent } from "../util/feature_detection.js"
+import { Delayed, Pass } from "../util/misc.js"
+
+import { commands } from "./commands.js"
// Run a handler that was bound to a key.
function doHandleBinding(cm, bound, dropShift) {
@@ -40,19 +40,30 @@ function lookupKeyForEditor(cm, name, handle) {
|| lookupKey(name, cm.options.keyMap, handle, cm)
}
+// Note that, despite the name, this function is also used to check
+// for bound mouse clicks.
+
let stopSeq = new Delayed
-function dispatchKey(cm, name, e, handle) {
+
+export function dispatchKey(cm, name, e, handle) {
let seq = cm.state.keySeq
if (seq) {
if (isModifierKey(name)) return "handled"
- stopSeq.set(50, () => {
- if (cm.state.keySeq == seq) {
- cm.state.keySeq = null
- cm.display.input.reset()
- }
- })
- name = seq + " " + name
+ if (/\'$/.test(name))
+ cm.state.keySeq = null
+ else
+ stopSeq.set(50, () => {
+ if (cm.state.keySeq == seq) {
+ cm.state.keySeq = null
+ cm.display.input.reset()
+ }
+ })
+ if (dispatchKeyInner(cm, seq + " " + name, e, handle)) return true
}
+ return dispatchKeyInner(cm, name, e, handle)
+}
+
+function dispatchKeyInner(cm, name, e, handle) {
let result = lookupKeyForEditor(cm, name, handle)
if (result == "multi")
@@ -65,10 +76,6 @@ function dispatchKey(cm, name, e, handle) {
restartBlink(cm)
}
- if (seq && !result && /\'$/.test(name)) {
- e_preventDefault(e)
- return true
- }
return !!result
}
diff --git a/js/codemirror-5.23.0/src/edit/legacy.js b/js/codemirror-5.39.0/src/edit/legacy.js
similarity index 70%
rename from js/codemirror-5.23.0/src/edit/legacy.js
rename to js/codemirror-5.39.0/src/edit/legacy.js
index bc3df6c..889badb 100644
--- a/js/codemirror-5.23.0/src/edit/legacy.js
+++ b/js/codemirror-5.39.0/src/edit/legacy.js
@@ -1,21 +1,21 @@
-import { scrollbarModel } from "../display/scrollbars"
-import { wheelEventPixels } from "../display/scroll_events"
-import { keyMap, keyName, isModifierKey, lookupKey, normalizeKeyMap } from "../input/keymap"
-import { keyNames } from "../input/keynames"
-import { Line } from "../line/line_data"
-import { cmp, Pos } from "../line/pos"
-import { changeEnd } from "../model/change_measurement"
-import Doc from "../model/Doc"
-import { LineWidget } from "../model/line_widget"
-import { SharedTextMarker, TextMarker } from "../model/mark_text"
-import { copyState, extendMode, getMode, innerMode, mimeModes, modeExtensions, modes, resolveMode, startState } from "../modes"
-import { addClass, contains, rmClass } from "../util/dom"
-import { e_preventDefault, e_stop, e_stopPropagation, off, on, signal } from "../util/event"
-import { splitLinesAuto } from "../util/feature_detection"
-import { countColumn, findColumn, isWordCharBasic, Pass } from "../util/misc"
-import StringStream from "../util/StringStream"
+import { scrollbarModel } from "../display/scrollbars.js"
+import { wheelEventPixels } from "../display/scroll_events.js"
+import { keyMap, keyName, isModifierKey, lookupKey, normalizeKeyMap } from "../input/keymap.js"
+import { keyNames } from "../input/keynames.js"
+import { Line } from "../line/line_data.js"
+import { cmp, Pos } from "../line/pos.js"
+import { changeEnd } from "../model/change_measurement.js"
+import Doc from "../model/Doc.js"
+import { LineWidget } from "../model/line_widget.js"
+import { SharedTextMarker, TextMarker } from "../model/mark_text.js"
+import { copyState, extendMode, getMode, innerMode, mimeModes, modeExtensions, modes, resolveMode, startState } from "../modes.js"
+import { addClass, contains, rmClass } from "../util/dom.js"
+import { e_preventDefault, e_stop, e_stopPropagation, off, on, signal } from "../util/event.js"
+import { splitLinesAuto } from "../util/feature_detection.js"
+import { countColumn, findColumn, isWordCharBasic, Pass } from "../util/misc.js"
+import StringStream from "../util/StringStream.js"
-import { commands } from "./commands"
+import { commands } from "./commands.js"
export function addLegacyProps(CodeMirror) {
CodeMirror.off = off
diff --git a/js/codemirror-5.23.0/src/edit/main.js b/js/codemirror-5.39.0/src/edit/main.js
similarity index 71%
rename from js/codemirror-5.23.0/src/edit/main.js
rename to js/codemirror-5.39.0/src/edit/main.js
index b6d3d48..f17e947 100644
--- a/js/codemirror-5.23.0/src/edit/main.js
+++ b/js/codemirror-5.39.0/src/edit/main.js
@@ -1,20 +1,20 @@
// EDITOR CONSTRUCTOR
-import { CodeMirror } from "./CodeMirror"
-export { CodeMirror } from "./CodeMirror"
+import { CodeMirror } from "./CodeMirror.js"
+export { CodeMirror } from "./CodeMirror.js"
-import { eventMixin } from "../util/event"
-import { indexOf } from "../util/misc"
+import { eventMixin } from "../util/event.js"
+import { indexOf } from "../util/misc.js"
-import { defineOptions } from "./options"
+import { defineOptions } from "./options.js"
defineOptions(CodeMirror)
-import addEditorMethods from "./methods"
+import addEditorMethods from "./methods.js"
addEditorMethods(CodeMirror)
-import Doc from "../model/Doc"
+import Doc from "../model/Doc.js"
// Set up methods on CodeMirror's prototype to redirect to the editor's document.
let dontDelegate = "iter insert remove copy getEditor constructor".split(" ")
@@ -27,13 +27,13 @@ eventMixin(Doc)
// INPUT HANDLING
-import ContentEditableInput from "../input/ContentEditableInput"
-import TextareaInput from "../input/TextareaInput"
+import ContentEditableInput from "../input/ContentEditableInput.js"
+import TextareaInput from "../input/TextareaInput.js"
CodeMirror.inputStyles = {"textarea": TextareaInput, "contenteditable": ContentEditableInput}
// MODE DEFINITION AND QUERYING
-import { defineMIME, defineMode } from "../modes"
+import { defineMIME, defineMode } from "../modes.js"
// Extra arguments are stored as the mode's dependencies, which is
// used by (legacy) mechanisms like loadmode.js to automatically
@@ -58,12 +58,12 @@ CodeMirror.defineDocExtension = (name, func) => {
Doc.prototype[name] = func
}
-import { fromTextArea } from "./fromTextArea"
+import { fromTextArea } from "./fromTextArea.js"
CodeMirror.fromTextArea = fromTextArea
-import { addLegacyProps } from "./legacy"
+import { addLegacyProps } from "./legacy.js"
addLegacyProps(CodeMirror)
-CodeMirror.version = "5.23.0"
+CodeMirror.version = "5.39.1"
diff --git a/js/codemirror-5.23.0/src/edit/methods.js b/js/codemirror-5.39.0/src/edit/methods.js
similarity index 86%
rename from js/codemirror-5.23.0/src/edit/methods.js
rename to js/codemirror-5.39.0/src/edit/methods.js
index 144e477..5cefed7 100644
--- a/js/codemirror-5.23.0/src/edit/methods.js
+++ b/js/codemirror-5.39.0/src/edit/methods.js
@@ -1,26 +1,27 @@
-import { deleteNearSelection } from "./deleteNearSelection"
-import { commands } from "./commands"
-import { attachDoc } from "../model/document_data"
-import { activeElt, addClass, rmClass } from "../util/dom"
-import { eventMixin, signal } from "../util/event"
-import { getLineStyles, getStateBefore, takeToken } from "../line/highlight"
-import { indentLine } from "../input/indent"
-import { triggerElectric } from "../input/input"
-import { onKeyDown, onKeyPress, onKeyUp } from "./key_events"
-import { getKeyMap } from "../input/keymap"
-import { methodOp, operation, runInOp } from "../display/operations"
-import { clipLine, clipPos, cmp, Pos } from "../line/pos"
-import { charCoords, charWidth, clearCaches, clearLineMeasurementCache, coordsChar, cursorCoords, displayHeight, displayWidth, estimateLineHeights, fromCoordSystem, intoCoordSystem, scrollGap, textHeight } from "../measurement/position_measurement"
-import { Range } from "../model/selection"
-import { replaceOneSelection, skipAtomic } from "../model/selection_updates"
-import { addToScrollPos, calculateScrollPos, ensureCursorVisible, resolveScrollToPos, scrollIntoView } from "../display/scrolling"
-import { heightAtLine } from "../line/spans"
-import { updateGutterSpace } from "../display/update_display"
-import { lineLeft, lineRight, moveLogically, moveVisually } from "../util/bidi"
-import { indexOf, insertSorted, isWordChar, sel_dontScroll, sel_move } from "../util/misc"
-import { signalLater } from "../util/operation_group"
-import { getLine, isLine, lineAtHeight } from "../line/utils_line"
-import { regChange, regLineChange } from "../display/view_tracking"
+import { deleteNearSelection } from "./deleteNearSelection.js"
+import { commands } from "./commands.js"
+import { attachDoc } from "../model/document_data.js"
+import { activeElt, addClass, rmClass } from "../util/dom.js"
+import { eventMixin, signal } from "../util/event.js"
+import { getLineStyles, getContextBefore, takeToken } from "../line/highlight.js"
+import { indentLine } from "../input/indent.js"
+import { triggerElectric } from "../input/input.js"
+import { onKeyDown, onKeyPress, onKeyUp } from "./key_events.js"
+import { onMouseDown } from "./mouse_events.js"
+import { getKeyMap } from "../input/keymap.js"
+import { endOfLine, moveLogically, moveVisually } from "../input/movement.js"
+import { endOperation, methodOp, operation, runInOp, startOperation } from "../display/operations.js"
+import { clipLine, clipPos, equalCursorPos, Pos } from "../line/pos.js"
+import { charCoords, charWidth, clearCaches, clearLineMeasurementCache, coordsChar, cursorCoords, displayHeight, displayWidth, estimateLineHeights, fromCoordSystem, intoCoordSystem, scrollGap, textHeight } from "../measurement/position_measurement.js"
+import { Range } from "../model/selection.js"
+import { replaceOneSelection, skipAtomic } from "../model/selection_updates.js"
+import { addToScrollTop, ensureCursorVisible, scrollIntoView, scrollToCoords, scrollToCoordsRange, scrollToRange } from "../display/scrolling.js"
+import { heightAtLine } from "../line/spans.js"
+import { updateGutterSpace } from "../display/update_display.js"
+import { indexOf, insertSorted, isWordChar, sel_dontScroll, sel_move } from "../util/misc.js"
+import { signalLater } from "../util/operation_group.js"
+import { getLine, isLine, lineAtHeight } from "../line/utils_line.js"
+import { regChange, regLineChange } from "../display/view_tracking.js"
// The publicly visible API. Note that methodOp(f) means
// 'wrap f in an operation, performed on its `this` parameter'.
@@ -177,7 +178,7 @@ export default function(CodeMirror) {
getStateAfter: function(line, precise) {
let doc = this.doc
line = clipLine(doc, line == null ? doc.first + doc.size - 1: line)
- return getStateBefore(this, line + 1, precise)
+ return getContextBefore(this, line + 1, precise).state
},
cursorCoords: function(start, mode) {
@@ -211,7 +212,7 @@ export default function(CodeMirror) {
} else {
lineObj = line
}
- return intoCoordSystem(this, lineObj, {top: 0, left: 0}, mode || "page", includeWidgets).top +
+ return intoCoordSystem(this, lineObj, {top: 0, left: 0}, mode || "page", includeWidgets || end).top +
(end ? this.doc.height - heightAtLine(lineObj) : 0)
},
@@ -252,12 +253,13 @@ export default function(CodeMirror) {
node.style.left = left + "px"
}
if (scroll)
- scrollIntoView(this, left, top, left + node.offsetWidth, top + node.offsetHeight)
+ scrollIntoView(this, {left, top, right: left + node.offsetWidth, bottom: top + node.offsetHeight})
},
triggerOnKeyDown: methodOp(onKeyDown),
triggerOnKeyPress: methodOp(onKeyPress),
triggerOnKeyUp: onKeyUp,
+ triggerOnMouseDown: methodOp(onMouseDown),
execCommand: function(cmd) {
if (commands.hasOwnProperty(cmd))
@@ -322,7 +324,7 @@ export default function(CodeMirror) {
goals.push(headPos.left)
let pos = findPosV(this, headPos, dir, unit)
if (unit == "page" && range == doc.sel.primary())
- addToScrollPos(this, null, charCoords(this, pos, "div").top - headPos.top)
+ addToScrollTop(this, charCoords(this, pos, "div").top - headPos.top)
return pos
}, sel_move)
if (goals.length) for (let i = 0; i < doc.sel.ranges.length; i++)
@@ -335,7 +337,7 @@ export default function(CodeMirror) {
let start = pos.ch, end = pos.ch
if (line) {
let helper = this.getHelper(pos, "wordChars")
- if ((pos.xRel < 0 || end == line.length) && start) --start; else ++end
+ if ((pos.sticky == "before" || end == line.length) && start) --start; else ++end
let startChar = line.charAt(start)
let check = isWordChar(startChar, helper)
? ch => isWordChar(ch, helper)
@@ -359,11 +361,7 @@ export default function(CodeMirror) {
hasFocus: function() { return this.display.input.getField() == activeElt() },
isReadOnly: function() { return !!(this.options.readOnly || this.doc.cantEdit) },
- scrollTo: methodOp(function(x, y) {
- if (x != null || y != null) resolveScrollToPos(this)
- if (x != null) this.curOp.scrollLeft = x
- if (y != null) this.curOp.scrollTop = y
- }),
+ scrollTo: methodOp(function (x, y) { scrollToCoords(this, x, y) }),
getScrollInfo: function() {
let scroller = this.display.scroller
return {left: scroller.scrollLeft, top: scroller.scrollTop,
@@ -385,14 +383,9 @@ export default function(CodeMirror) {
range.margin = margin || 0
if (range.from.line != null) {
- resolveScrollToPos(this)
- this.curOp.scrollToPos = range
+ scrollToRange(this, range)
} else {
- let sPos = calculateScrollPos(this, Math.min(range.from.left, range.to.left),
- Math.min(range.from.top, range.to.top) - range.margin,
- Math.max(range.from.right, range.to.right),
- Math.max(range.from.bottom, range.to.bottom) + range.margin)
- this.scrollTo(sPos.scrollLeft, sPos.scrollTop)
+ scrollToCoordsRange(this, range.from, range.to, range.margin)
}
}),
@@ -412,13 +405,15 @@ export default function(CodeMirror) {
}),
operation: function(f){return runInOp(this, f)},
+ startOperation: function(){return startOperation(this)},
+ endOperation: function(){return endOperation(this)},
refresh: methodOp(function() {
let oldHeight = this.display.cachedTextHeight
regChange(this)
this.curOp.forceUpdate = true
clearCaches(this)
- this.scrollTo(this.doc.scrollLeft, this.doc.scrollTop)
+ scrollToCoords(this, this.doc.scrollLeft, this.doc.scrollTop)
updateGutterSpace(this)
if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5)
estimateLineHeights(this)
@@ -431,7 +426,7 @@ export default function(CodeMirror) {
attachDoc(this, doc)
clearCaches(this)
this.display.input.reset()
- this.scrollTo(doc.scrollLeft, doc.scrollTop)
+ scrollToCoords(this, doc.scrollLeft, doc.scrollTop)
this.curOp.forceScroll = true
signalLater(this, "swapDoc", this, old)
return old
@@ -464,22 +459,30 @@ export default function(CodeMirror) {
// position. The resulting position will have a hitSide=true
// property if it reached the end of the document.
function findPosH(doc, pos, dir, unit, visually) {
- let line = pos.line, ch = pos.ch, origDir = dir
- let lineObj = getLine(doc, line)
+ let oldPos = pos
+ let origDir = dir
+ let lineObj = getLine(doc, pos.line)
function findNextLine() {
- let l = line + dir
+ let l = pos.line + dir
if (l < doc.first || l >= doc.first + doc.size) return false
- line = l
+ pos = new Pos(l, pos.ch, pos.sticky)
return lineObj = getLine(doc, l)
}
function moveOnce(boundToLine) {
- let next = (visually ? moveVisually : moveLogically)(lineObj, ch, dir, true)
+ let next
+ if (visually) {
+ next = moveVisually(doc.cm, lineObj, pos, dir)
+ } else {
+ next = moveLogically(lineObj, pos, dir)
+ }
if (next == null) {
- if (!boundToLine && findNextLine()) {
- if (visually) ch = (dir < 0 ? lineRight : lineLeft)(lineObj)
- else ch = dir < 0 ? lineObj.text.length : 0
- } else return false
- } else ch = next
+ if (!boundToLine && findNextLine())
+ pos = endOfLine(visually, doc.cm, lineObj, pos.line, dir)
+ else
+ return false
+ } else {
+ pos = next
+ }
return true
}
@@ -492,14 +495,14 @@ function findPosH(doc, pos, dir, unit, visually) {
let helper = doc.cm && doc.cm.getHelper(pos, "wordChars")
for (let first = true;; first = false) {
if (dir < 0 && !moveOnce(!first)) break
- let cur = lineObj.text.charAt(ch) || "\n"
+ let cur = lineObj.text.charAt(pos.ch) || "\n"
let type = isWordChar(cur, helper) ? "w"
: group && cur == "\n" ? "n"
: !group || /\s/.test(cur) ? null
: "p"
if (group && !first && !type) type = "s"
if (sawType && sawType != type) {
- if (dir < 0) {dir = 1; moveOnce()}
+ if (dir < 0) {dir = 1; moveOnce(); pos.sticky = "after"}
break
}
@@ -507,8 +510,8 @@ function findPosH(doc, pos, dir, unit, visually) {
if (dir > 0 && !moveOnce(!first)) break
}
}
- let result = skipAtomic(doc, Pos(line, ch), pos, origDir, true)
- if (!cmp(pos, result)) result.hitSide = true
+ let result = skipAtomic(doc, pos, oldPos, origDir, true)
+ if (equalCursorPos(oldPos, result)) result.hitSide = true
return result
}
diff --git a/js/codemirror-5.39.0/src/edit/mouse_events.js b/js/codemirror-5.39.0/src/edit/mouse_events.js
new file mode 100644
index 0000000..4ecb715
--- /dev/null
+++ b/js/codemirror-5.39.0/src/edit/mouse_events.js
@@ -0,0 +1,407 @@
+import { delayBlurEvent, ensureFocus } from "../display/focus.js"
+import { operation } from "../display/operations.js"
+import { visibleLines } from "../display/update_lines.js"
+import { clipPos, cmp, maxPos, minPos, Pos } from "../line/pos.js"
+import { getLine, lineAtHeight } from "../line/utils_line.js"
+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 { 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"
+import { dragAndDrop } from "../util/feature_detection.js"
+import { bind, countColumn, findColumn, sel_mouse } from "../util/misc.js"
+import { addModifierNames } from "../input/keymap.js"
+import { Pass } from "../util/misc.js"
+
+import { dispatchKey } from "./key_events.js"
+import { commands } from "./commands.js"
+
+const DOUBLECLICK_DELAY = 400
+
+class PastClick {
+ constructor(time, pos, button) {
+ this.time = time
+ this.pos = pos
+ this.button = button
+ }
+
+ compare(time, pos, button) {
+ return this.time + DOUBLECLICK_DELAY > time &&
+ cmp(pos, this.pos) == 0 && button == this.button
+ }
+}
+
+let lastClick, lastDoubleClick
+function clickRepeat(pos, button) {
+ let now = +new Date
+ if (lastDoubleClick && lastDoubleClick.compare(now, pos, button)) {
+ lastClick = lastDoubleClick = null
+ return "triple"
+ } else if (lastClick && lastClick.compare(now, pos, button)) {
+ lastDoubleClick = new PastClick(now, pos, button)
+ lastClick = null
+ return "double"
+ } else {
+ lastClick = new PastClick(now, pos, button)
+ lastDoubleClick = null
+ return "single"
+ }
+}
+
+// A mouse down can be a single click, double click, triple click,
+// start of selection drag, start of text drag, new cursor
+// (ctrl-click), rectangle drag (alt-drag), or xwin
+// middle-click-paste. Or it might be a click on something we should
+// not interfere with, such as a scrollbar or widget.
+export function onMouseDown(e) {
+ let cm = this, display = cm.display
+ if (signalDOMEvent(cm, e) || display.activeTouch && display.input.supportsTouch()) return
+ display.input.ensurePolled()
+ display.shift = e.shiftKey
+
+ if (eventInWidget(display, e)) {
+ if (!webkit) {
+ // Briefly turn off draggability, to allow widgets to do
+ // normal dragging things.
+ display.scroller.draggable = false
+ setTimeout(() => display.scroller.draggable = true, 100)
+ }
+ return
+ }
+ if (clickInGutter(cm, e)) return
+ let pos = posFromMouse(cm, e), button = e_button(e), repeat = pos ? clickRepeat(pos, button) : "single"
+ window.focus()
+
+ // #3261: make sure, that we're not starting a second selection
+ if (button == 1 && cm.state.selectingText)
+ cm.state.selectingText(e)
+
+ if (pos && handleMappedButton(cm, button, pos, repeat, e)) return
+
+ if (button == 1) {
+ if (pos) leftButtonDown(cm, pos, repeat, e)
+ else if (e_target(e) == display.scroller) e_preventDefault(e)
+ } else if (button == 2) {
+ if (pos) extendSelection(cm.doc, pos)
+ setTimeout(() => display.input.focus(), 20)
+ } else if (button == 3) {
+ if (captureRightClick) onContextMenu(cm, e)
+ else delayBlurEvent(cm)
+ }
+}
+
+function handleMappedButton(cm, button, pos, repeat, event) {
+ let name = "Click"
+ if (repeat == "double") name = "Double" + name
+ else if (repeat == "triple") name = "Triple" + name
+ name = (button == 1 ? "Left" : button == 2 ? "Middle" : "Right") + name
+
+ return dispatchKey(cm, addModifierNames(name, event), event, bound => {
+ if (typeof bound == "string") bound = commands[bound]
+ if (!bound) return false
+ let done = false
+ try {
+ if (cm.isReadOnly()) cm.state.suppressEdits = true
+ done = bound(cm, pos) != Pass
+ } finally {
+ cm.state.suppressEdits = false
+ }
+ return done
+ })
+}
+
+function configureMouse(cm, repeat, event) {
+ let option = cm.getOption("configureMouse")
+ let value = option ? option(cm, repeat, event) : {}
+ if (value.unit == null) {
+ let rect = chromeOS ? event.shiftKey && event.metaKey : event.altKey
+ value.unit = rect ? "rectangle" : repeat == "single" ? "char" : repeat == "double" ? "word" : "line"
+ }
+ if (value.extend == null || cm.doc.extend) value.extend = cm.doc.extend || event.shiftKey
+ if (value.addNew == null) value.addNew = mac ? event.metaKey : event.ctrlKey
+ if (value.moveOnDrag == null) value.moveOnDrag = !(mac ? event.altKey : event.ctrlKey)
+ return value
+}
+
+function leftButtonDown(cm, pos, repeat, event) {
+ if (ie) setTimeout(bind(ensureFocus, cm), 0)
+ else cm.curOp.focus = activeElt()
+
+ let behavior = configureMouse(cm, repeat, event)
+
+ let sel = cm.doc.sel, contained
+ if (cm.options.dragDrop && dragAndDrop && !cm.isReadOnly() &&
+ repeat == "single" && (contained = sel.contains(pos)) > -1 &&
+ (cmp((contained = sel.ranges[contained]).from(), pos) < 0 || pos.xRel > 0) &&
+ (cmp(contained.to(), pos) > 0 || pos.xRel < 0))
+ leftButtonStartDrag(cm, event, pos, behavior)
+ else
+ leftButtonSelect(cm, event, pos, behavior)
+}
+
+// Start a text drag. When it ends, see if any dragging actually
+// happen, and treat as a click if it didn't.
+function leftButtonStartDrag(cm, event, pos, behavior) {
+ let display = cm.display, moved = false
+ let dragEnd = operation(cm, e => {
+ if (webkit) display.scroller.draggable = false
+ cm.state.draggingText = false
+ off(display.wrapper.ownerDocument, "mouseup", dragEnd)
+ off(display.wrapper.ownerDocument, "mousemove", mouseMove)
+ off(display.scroller, "dragstart", dragStart)
+ off(display.scroller, "drop", dragEnd)
+ if (!moved) {
+ e_preventDefault(e)
+ 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)
+ else
+ display.input.focus()
+ }
+ })
+ let mouseMove = function(e2) {
+ moved = moved || Math.abs(event.clientX - e2.clientX) + Math.abs(event.clientY - e2.clientY) >= 10
+ }
+ let dragStart = () => moved = true
+ // Let the drag handler handle this.
+ if (webkit) display.scroller.draggable = true
+ cm.state.draggingText = dragEnd
+ dragEnd.copy = !behavior.moveOnDrag
+ // IE's approach to draggable
+ if (display.scroller.dragDrop) display.scroller.dragDrop()
+ on(display.wrapper.ownerDocument, "mouseup", dragEnd)
+ on(display.wrapper.ownerDocument, "mousemove", mouseMove)
+ on(display.scroller, "dragstart", dragStart)
+ on(display.scroller, "drop", dragEnd)
+
+ delayBlurEvent(cm)
+ setTimeout(() => display.input.focus(), 20)
+}
+
+function rangeForUnit(cm, pos, unit) {
+ if (unit == "char") return new Range(pos, pos)
+ if (unit == "word") return cm.findWordAt(pos)
+ if (unit == "line") return new Range(Pos(pos.line, 0), clipPos(cm.doc, Pos(pos.line + 1, 0)))
+ let result = unit(cm, pos)
+ return new Range(result.from, result.to)
+}
+
+// Normal selection, as opposed to text dragging.
+function leftButtonSelect(cm, event, start, behavior) {
+ let display = cm.display, doc = cm.doc
+ e_preventDefault(event)
+
+ let ourRange, ourIndex, startSel = doc.sel, ranges = startSel.ranges
+ if (behavior.addNew && !behavior.extend) {
+ ourIndex = doc.sel.contains(start)
+ if (ourIndex > -1)
+ ourRange = ranges[ourIndex]
+ else
+ ourRange = new Range(start, start)
+ } else {
+ ourRange = doc.sel.primary()
+ ourIndex = doc.sel.primIndex
+ }
+
+ if (behavior.unit == "rectangle") {
+ if (!behavior.addNew) ourRange = new Range(start, start)
+ start = posFromMouse(cm, event, true, true)
+ ourIndex = -1
+ } else {
+ let range = rangeForUnit(cm, start, behavior.unit)
+ if (behavior.extend)
+ ourRange = extendRange(ourRange, range.anchor, range.head, behavior.extend)
+ else
+ ourRange = range
+ }
+
+ if (!behavior.addNew) {
+ ourIndex = 0
+ setSelection(doc, new Selection([ourRange], 0), sel_mouse)
+ startSel = doc.sel
+ } else if (ourIndex == -1) {
+ ourIndex = ranges.length
+ setSelection(doc, normalizeSelection(ranges.concat([ourRange]), ourIndex),
+ {scroll: false, origin: "*mouse"})
+ } else if (ranges.length > 1 && ranges[ourIndex].empty() && behavior.unit == "char" && !behavior.extend) {
+ setSelection(doc, normalizeSelection(ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0),
+ {scroll: false, origin: "*mouse"})
+ startSel = doc.sel
+ } else {
+ replaceOneSelection(doc, ourIndex, ourRange, sel_mouse)
+ }
+
+ let lastPos = start
+ function extendTo(pos) {
+ if (cmp(lastPos, pos) == 0) return
+ lastPos = pos
+
+ if (behavior.unit == "rectangle") {
+ let ranges = [], tabSize = cm.options.tabSize
+ let startCol = countColumn(getLine(doc, start.line).text, start.ch, tabSize)
+ let posCol = countColumn(getLine(doc, pos.line).text, pos.ch, tabSize)
+ let left = Math.min(startCol, posCol), right = Math.max(startCol, posCol)
+ for (let line = Math.min(start.line, pos.line), end = Math.min(cm.lastLine(), Math.max(start.line, pos.line));
+ line <= end; line++) {
+ let text = getLine(doc, line).text, leftPos = findColumn(text, left, tabSize)
+ if (left == right)
+ ranges.push(new Range(Pos(line, leftPos), Pos(line, leftPos)))
+ else if (text.length > leftPos)
+ ranges.push(new Range(Pos(line, leftPos), Pos(line, findColumn(text, right, tabSize))))
+ }
+ if (!ranges.length) ranges.push(new Range(start, start))
+ setSelection(doc, normalizeSelection(startSel.ranges.slice(0, ourIndex).concat(ranges), ourIndex),
+ {origin: "*mouse", scroll: false})
+ cm.scrollIntoView(pos)
+ } else {
+ let oldRange = ourRange
+ let range = rangeForUnit(cm, pos, behavior.unit)
+ let anchor = oldRange.anchor, head
+ if (cmp(range.anchor, anchor) > 0) {
+ head = range.head
+ anchor = minPos(oldRange.from(), range.anchor)
+ } else {
+ head = range.anchor
+ anchor = maxPos(oldRange.to(), range.head)
+ }
+ let ranges = startSel.ranges.slice(0)
+ ranges[ourIndex] = bidiSimplify(cm, new Range(clipPos(doc, anchor), head))
+ setSelection(doc, normalizeSelection(ranges, ourIndex), sel_mouse)
+ }
+ }
+
+ let editorSize = display.wrapper.getBoundingClientRect()
+ // Used to ensure timeout re-tries don't fire when another extend
+ // happened in the meantime (clearTimeout isn't reliable -- at
+ // least on Chrome, the timeouts still happen even when cleared,
+ // if the clear happens after their scheduled firing time).
+ let counter = 0
+
+ function extend(e) {
+ let curCount = ++counter
+ let cur = posFromMouse(cm, e, true, behavior.unit == "rectangle")
+ if (!cur) return
+ if (cmp(cur, lastPos) != 0) {
+ cm.curOp.focus = activeElt()
+ extendTo(cur)
+ let visible = visibleLines(display, doc)
+ if (cur.line >= visible.to || cur.line < visible.from)
+ setTimeout(operation(cm, () => {if (counter == curCount) extend(e)}), 150)
+ } else {
+ let outside = e.clientY < editorSize.top ? -20 : e.clientY > editorSize.bottom ? 20 : 0
+ if (outside) setTimeout(operation(cm, () => {
+ if (counter != curCount) return
+ display.scroller.scrollTop += outside
+ extend(e)
+ }), 50)
+ }
+ }
+
+ function done(e) {
+ cm.state.selectingText = false
+ counter = Infinity
+ e_preventDefault(e)
+ display.input.focus()
+ off(display.wrapper.ownerDocument, "mousemove", move)
+ off(display.wrapper.ownerDocument, "mouseup", up)
+ doc.history.lastSelOrigin = null
+ }
+
+ let move = operation(cm, e => {
+ if (e.buttons === 0 || !e_button(e)) done(e)
+ else extend(e)
+ })
+ let up = operation(cm, done)
+ cm.state.selectingText = up
+ on(display.wrapper.ownerDocument, "mousemove", move)
+ on(display.wrapper.ownerDocument, "mouseup", up)
+}
+
+// Used when mouse-selecting to adjust the anchor to the proper side
+// of a bidi jump depending on the visual position of the head.
+function bidiSimplify(cm, range) {
+ let {anchor, head} = range, anchorLine = getLine(cm.doc, anchor.line)
+ if (cmp(anchor, head) == 0 && anchor.sticky == head.sticky) return range
+ let order = getOrder(anchorLine)
+ if (!order) return range
+ let index = getBidiPartAt(order, anchor.ch, anchor.sticky), part = order[index]
+ if (part.from != anchor.ch && part.to != anchor.ch) return range
+ let boundary = index + ((part.from == anchor.ch) == (part.level != 1) ? 0 : 1)
+ if (boundary == 0 || boundary == order.length) return range
+
+ // Compute the relative visual position of the head compared to the
+ // anchor (<0 is to the left, >0 to the right)
+ let leftSide
+ if (head.line != anchor.line) {
+ leftSide = (head.line - anchor.line) * (cm.doc.direction == "ltr" ? 1 : -1) > 0
+ } else {
+ let headIndex = getBidiPartAt(order, head.ch, head.sticky)
+ let dir = headIndex - index || (head.ch - anchor.ch) * (part.level == 1 ? -1 : 1)
+ if (headIndex == boundary - 1 || headIndex == boundary)
+ leftSide = dir < 0
+ else
+ leftSide = dir > 0
+ }
+
+ let usePart = order[boundary + (leftSide ? -1 : 0)]
+ let from = leftSide == (usePart.level == 1)
+ let ch = from ? usePart.from : usePart.to, sticky = from ? "after" : "before"
+ return anchor.ch == ch && anchor.sticky == sticky ? range : new Range(new Pos(anchor.line, ch, sticky), head)
+}
+
+
+// Determines whether an event happened in the gutter, and fires the
+// handlers for the corresponding event.
+function gutterEvent(cm, e, type, prevent) {
+ let mX, mY
+ if (e.touches) {
+ mX = e.touches[0].clientX
+ mY = e.touches[0].clientY
+ } else {
+ try { mX = e.clientX; mY = e.clientY }
+ catch(e) { return false }
+ }
+ if (mX >= Math.floor(cm.display.gutters.getBoundingClientRect().right)) return false
+ if (prevent) e_preventDefault(e)
+
+ let display = cm.display
+ let lineBox = display.lineDiv.getBoundingClientRect()
+
+ if (mY > lineBox.bottom || !hasHandler(cm, type)) return e_defaultPrevented(e)
+ mY -= lineBox.top - display.viewOffset
+
+ for (let i = 0; i < cm.options.gutters.length; ++i) {
+ let g = display.gutters.childNodes[i]
+ if (g && g.getBoundingClientRect().right >= mX) {
+ let line = lineAtHeight(cm.doc, mY)
+ let gutter = cm.options.gutters[i]
+ signal(cm, type, cm, line, gutter, e)
+ return e_defaultPrevented(e)
+ }
+ }
+}
+
+export function clickInGutter(cm, e) {
+ return gutterEvent(cm, e, "gutterClick", true)
+}
+
+// CONTEXT MENU HANDLING
+
+// To make the context menu work, we need to briefly unhide the
+// textarea (making it as unobtrusive as possible) to let the
+// right-click take effect on it.
+export function onContextMenu(cm, e) {
+ if (eventInWidget(cm.display, e) || contextMenuInGutter(cm, e)) return
+ if (signalDOMEvent(cm, e, "contextmenu")) return
+ cm.display.input.onContextMenu(e)
+}
+
+function contextMenuInGutter(cm, e) {
+ if (!hasHandler(cm, "gutterContextMenu")) return false
+ return gutterEvent(cm, e, "gutterContextMenu", false)
+}
diff --git a/js/codemirror-5.23.0/src/edit/options.js b/js/codemirror-5.39.0/src/edit/options.js
similarity index 85%
rename from js/codemirror-5.23.0/src/edit/options.js
rename to js/codemirror-5.39.0/src/edit/options.js
index dffc577..49cf101 100644
--- a/js/codemirror-5.23.0/src/edit/options.js
+++ b/js/codemirror-5.39.0/src/edit/options.js
@@ -1,21 +1,21 @@
-import { onBlur } from "../display/focus"
-import { setGuttersForLineNumbers, updateGutters } from "../display/gutters"
-import { alignHorizontally } from "../display/line_numbers"
-import { loadMode, resetModeState } from "../display/mode_state"
-import { initScrollbars, updateScrollbars } from "../display/scrollbars"
-import { updateSelection } from "../display/selection"
-import { regChange } from "../display/view_tracking"
-import { getKeyMap } from "../input/keymap"
-import { defaultSpecialCharPlaceholder } from "../line/line_data"
-import { Pos } from "../line/pos"
-import { findMaxLine } from "../line/spans"
-import { clearCaches, compensateForHScroll, estimateLineHeights } from "../measurement/position_measurement"
-import { replaceRange } from "../model/changes"
-import { mobile, windows } from "../util/browser"
-import { addClass, rmClass } from "../util/dom"
-import { off, on } from "../util/event"
-
-import { themeChanged } from "./utils"
+import { onBlur } from "../display/focus.js"
+import { setGuttersForLineNumbers, updateGutters } from "../display/gutters.js"
+import { alignHorizontally } from "../display/line_numbers.js"
+import { loadMode, resetModeState } from "../display/mode_state.js"
+import { initScrollbars, updateScrollbars } from "../display/scrollbars.js"
+import { updateSelection } from "../display/selection.js"
+import { regChange } from "../display/view_tracking.js"
+import { getKeyMap } from "../input/keymap.js"
+import { defaultSpecialCharPlaceholder } from "../line/line_data.js"
+import { Pos } from "../line/pos.js"
+import { findMaxLine } from "../line/spans.js"
+import { clearCaches, compensateForHScroll, estimateLineHeights } from "../measurement/position_measurement.js"
+import { replaceRange } from "../model/changes.js"
+import { mobile, windows } from "../util/browser.js"
+import { addClass, rmClass } from "../util/dom.js"
+import { off, on } from "../util/event.js"
+
+import { themeChanged } from "./utils.js"
export let Init = {toString: function(){return "CodeMirror.Init"}}
@@ -52,6 +52,7 @@ export function defineOptions(CodeMirror) {
clearCaches(cm)
regChange(cm)
}, true)
+
option("lineSeparator", null, (cm, val) => {
cm.doc.lineSep = val
if (!val) return
@@ -68,7 +69,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\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff]/g, (cm, val, old) => {
+ option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff]/g, (cm, val, old) => {
cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g")
if (old != Init) cm.refresh()
})
@@ -92,6 +93,7 @@ export function defineOptions(CodeMirror) {
if (next.attach) next.attach(cm, prev || null)
})
option("extraKeys", null)
+ option("configureMouse", null)
option("lineWrapping", false, wrappingChanged, true)
option("gutters", [], cm => {
@@ -119,14 +121,12 @@ export function defineOptions(CodeMirror) {
option("resetSelectionOnContextMenu", true)
option("lineWiseCopyCut", true)
+ option("pasteLinesPerSelection", true)
option("readOnly", false, (cm, val) => {
if (val == "nocursor") {
onBlur(cm)
cm.display.input.blur()
- cm.display.disabled = true
- } else {
- cm.display.disabled = false
}
cm.display.input.readOnlyChanged(val)
})
@@ -153,6 +153,7 @@ export function defineOptions(CodeMirror) {
option("tabindex", null, (cm, val) => cm.display.input.getField().tabIndex = val || "")
option("autofocus", null)
+ option("direction", "ltr", (cm, val) => cm.doc.setDirection(val), true)
}
function guttersChanged(cm) {
diff --git a/js/codemirror-5.23.0/src/edit/utils.js b/js/codemirror-5.39.0/src/edit/utils.js
similarity index 98%
rename from js/codemirror-5.23.0/src/edit/utils.js
rename to js/codemirror-5.39.0/src/edit/utils.js
index 61f7955..fda0be7 100644
--- a/js/codemirror-5.23.0/src/edit/utils.js
+++ b/js/codemirror-5.39.0/src/edit/utils.js
@@ -1,4 +1,4 @@
-import { clearCaches } from "../measurement/position_measurement"
+import { clearCaches } from "../measurement/position_measurement.js"
export function themeChanged(cm) {
cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-s-\S+/g, "") +
diff --git a/js/codemirror-5.23.0/src/input/ContentEditableInput.js b/js/codemirror-5.39.0/src/input/ContentEditableInput.js
similarity index 74%
rename from js/codemirror-5.23.0/src/input/ContentEditableInput.js
rename to js/codemirror-5.39.0/src/input/ContentEditableInput.js
index 4c7b58e..986690b 100644
--- a/js/codemirror-5.23.0/src/input/ContentEditableInput.js
+++ b/js/codemirror-5.39.0/src/input/ContentEditableInput.js
@@ -1,18 +1,18 @@
-import { operation, runInOp } from "../display/operations"
-import { prepareSelection } from "../display/selection"
-import { regChange } from "../display/view_tracking"
-import { applyTextInput, copyableRanges, disableBrowserMagic, handlePaste, hiddenTextarea, lastCopied, setLastCopied } from "./input"
-import { cmp, maxPos, minPos, Pos } from "../line/pos"
-import { getBetween, getLine, lineNo } from "../line/utils_line"
-import { findViewForLine, findViewIndex, mapFromLineView, nodeAndOffsetInLineMap } from "../measurement/position_measurement"
-import { replaceRange } from "../model/changes"
-import { simpleSelection } from "../model/selection"
-import { setSelection } from "../model/selection_updates"
-import { getBidiPartAt, getOrder } from "../util/bidi"
-import { gecko, ie_version } from "../util/browser"
-import { contains, range, removeChildrenAndAdd, selectInput } from "../util/dom"
-import { on, signalDOMEvent } from "../util/event"
-import { Delayed, lst, sel_dontScroll } from "../util/misc"
+import { operation, runInOp } from "../display/operations.js"
+import { prepareSelection } from "../display/selection.js"
+import { regChange } from "../display/view_tracking.js"
+import { applyTextInput, copyableRanges, disableBrowserMagic, handlePaste, hiddenTextarea, lastCopied, setLastCopied } from "./input.js"
+import { cmp, maxPos, minPos, Pos } from "../line/pos.js"
+import { getBetween, getLine, lineNo } from "../line/utils_line.js"
+import { findViewForLine, findViewIndex, mapFromLineView, nodeAndOffsetInLineMap } from "../measurement/position_measurement.js"
+import { replaceRange } from "../model/changes.js"
+import { simpleSelection } from "../model/selection.js"
+import { setSelection } from "../model/selection_updates.js"
+import { getBidiPartAt, getOrder } from "../util/bidi.js"
+import { android, chrome, gecko, ie_version } from "../util/browser.js"
+import { contains, range, removeChildrenAndAdd, selectInput } from "../util/dom.js"
+import { on, signalDOMEvent } from "../util/event.js"
+import { Delayed, lst, sel_dontScroll } from "../util/misc.js"
// CONTENTEDITABLE INPUT STYLE
@@ -34,9 +34,7 @@ export default class ContentEditableInput {
on(div, "paste", e => {
if (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, () => {
- if (!input.pollContent()) regChange(cm)
- }), 20)
+ if (ie_version <= 11) setTimeout(operation(cm, () => this.updateFromDOM()), 20)
})
on(div, "compositionstart", e => {
@@ -113,34 +111,46 @@ export default class ContentEditableInput {
this.showMultipleSelections(info)
}
+ getSelection() {
+ return this.cm.display.wrapper.ownerDocument.getSelection()
+ }
+
showPrimarySelection() {
- let sel = window.getSelection(), prim = this.cm.doc.sel.primary()
- let curAnchor = domToPos(this.cm, sel.anchorNode, sel.anchorOffset)
- let curFocus = domToPos(this.cm, sel.focusNode, sel.focusOffset)
- if (curAnchor && !curAnchor.bad && curFocus && !curFocus.bad &&
- cmp(minPos(curAnchor, curFocus), prim.from()) == 0 &&
- cmp(maxPos(curAnchor, curFocus), prim.to()) == 0)
+ let sel = this.getSelection(), cm = this.cm, prim = cm.doc.sel.primary()
+ let from = prim.from(), to = prim.to()
+
+ if (cm.display.viewTo == cm.display.viewFrom || from.line >= cm.display.viewTo || to.line < cm.display.viewFrom) {
+ sel.removeAllRanges()
return
+ }
- let start = posToDOM(this.cm, prim.from())
- let end = posToDOM(this.cm, prim.to())
- if (!start && !end) return
+ let curAnchor = domToPos(cm, sel.anchorNode, sel.anchorOffset)
+ let curFocus = domToPos(cm, sel.focusNode, sel.focusOffset)
+ if (curAnchor && !curAnchor.bad && curFocus && !curFocus.bad &&
+ cmp(minPos(curAnchor, curFocus), from) == 0 &&
+ cmp(maxPos(curAnchor, curFocus), to) == 0)
+ return
- let view = this.cm.display.view
- let old = sel.rangeCount && sel.getRangeAt(0)
- if (!start) {
- start = {node: view[0].measure.map[2], offset: 0}
- } else if (!end) { // FIXME dangerously hacky
+ let view = cm.display.view
+ let start = (from.line >= cm.display.viewFrom && posToDOM(cm, from)) ||
+ {node: view[0].measure.map[2], offset: 0}
+ let end = to.line < cm.display.viewTo && posToDOM(cm, to)
+ if (!end) {
let measure = view[view.length - 1].measure
let map = measure.maps ? measure.maps[measure.maps.length - 1] : measure.map
end = {node: map[map.length - 1], offset: map[map.length - 2] - map[map.length - 3]}
}
- let rng
+ if (!start || !end) {
+ sel.removeAllRanges()
+ return
+ }
+
+ let old = sel.rangeCount && sel.getRangeAt(0), rng
try { rng = range(start.node, start.offset, end.offset, end.node) }
catch(e) {} // Our model of the DOM might be outdated, in which case the range we try to set can be impossible
if (rng) {
- if (!gecko && this.cm.state.focused) {
+ if (!gecko && cm.state.focused) {
sel.collapse(start.node, start.offset)
if (!rng.collapsed) {
sel.removeAllRanges()
@@ -171,13 +181,13 @@ export default class ContentEditableInput {
}
rememberSelection() {
- let sel = window.getSelection()
+ let sel = this.getSelection()
this.lastAnchorNode = sel.anchorNode; this.lastAnchorOffset = sel.anchorOffset
this.lastFocusNode = sel.focusNode; this.lastFocusOffset = sel.focusOffset
}
selectionInEditor() {
- let sel = window.getSelection()
+ let sel = this.getSelection()
if (!sel.rangeCount) return false
let node = sel.getRangeAt(0).commonAncestorContainer
return contains(this.div, node)
@@ -212,22 +222,34 @@ export default class ContentEditableInput {
}
selectionChanged() {
- let sel = window.getSelection()
+ let sel = this.getSelection()
return sel.anchorNode != this.lastAnchorNode || sel.anchorOffset != this.lastAnchorOffset ||
sel.focusNode != this.lastFocusNode || sel.focusOffset != this.lastFocusOffset
}
pollSelection() {
- if (!this.composing && this.readDOMTimeout == null && !this.gracePeriod && this.selectionChanged()) {
- let sel = window.getSelection(), cm = this.cm
- this.rememberSelection()
- let anchor = domToPos(cm, sel.anchorNode, sel.anchorOffset)
- let head = domToPos(cm, sel.focusNode, sel.focusOffset)
- if (anchor && head) runInOp(cm, () => {
- setSelection(cm.doc, simpleSelection(anchor, head), sel_dontScroll)
- if (anchor.bad || head.bad) cm.curOp.selectionChanged = true
- })
+ if (this.readDOMTimeout != null || this.gracePeriod || !this.selectionChanged()) return
+ let sel = this.getSelection(), cm = this.cm
+ // On Android Chrome (version 56, at least), backspacing into an
+ // uneditable block element will put the cursor in that element,
+ // and then, because it's not editable, hide the virtual keyboard.
+ // Because Android doesn't allow us to actually detect backspace
+ // presses in a sane way, this code checks for when that happens
+ // and simulates a backspace press in this case.
+ if (android && chrome && this.cm.options.gutters.length && isInGutter(sel.anchorNode)) {
+ this.cm.triggerOnKeyDown({type: "keydown", keyCode: 8, preventDefault: Math.abs})
+ this.blur()
+ this.focus()
+ return
}
+ if (this.composing) return
+ this.rememberSelection()
+ let anchor = domToPos(cm, sel.anchorNode, sel.anchorOffset)
+ let head = domToPos(cm, sel.focusNode, sel.focusOffset)
+ if (anchor && head) runInOp(cm, () => {
+ setSelection(cm.doc, simpleSelection(anchor, head), sel_dontScroll)
+ if (anchor.bad || head.bad) cm.curOp.selectionChanged = true
+ })
}
pollContent() {
@@ -281,6 +303,14 @@ export default class ContentEditableInput {
while (cutEnd < maxCutEnd &&
newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1))
++cutEnd
+ // Try to move start of change to start of selection if ambiguous
+ if (newText.length == 1 && oldText.length == 1 && fromLine == from.line) {
+ while (cutFront && cutFront > from.ch &&
+ newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1)) {
+ cutFront--
+ cutEnd++
+ }
+ }
newText[newText.length - 1] = newBot.slice(0, newBot.length - cutEnd).replace(/^\u200b+/, "")
newText[0] = newText[0].slice(cutFront).replace(/\u200b+$/, "")
@@ -303,7 +333,7 @@ export default class ContentEditableInput {
if (!this.composing) return
clearTimeout(this.readDOMTimeout)
this.composing = null
- if (!this.pollContent()) regChange(this.cm)
+ this.updateFromDOM()
this.div.blur()
this.div.focus()
}
@@ -315,16 +345,21 @@ export default class ContentEditableInput {
if (this.composing.done) this.composing = null
else return
}
- if (this.cm.isReadOnly() || !this.pollContent())
- runInOp(this.cm, () => regChange(this.cm))
+ this.updateFromDOM()
}, 80)
}
+ updateFromDOM() {
+ if (this.cm.isReadOnly() || !this.pollContent())
+ runInOp(this.cm, () => regChange(this.cm))
+ }
+
setUneditable(node) {
node.contentEditable = "false"
}
onKeyPress(e) {
+ if (e.charCode == 0 || this.composing) return
e.preventDefault()
if (!this.cm.isReadOnly())
operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0)
@@ -346,7 +381,7 @@ function posToDOM(cm, pos) {
let line = getLine(cm.doc, pos.line)
let info = mapFromLineView(view, line, pos.line)
- let order = getOrder(line), side = "left"
+ let order = getOrder(line, cm.doc.direction), side = "left"
if (order) {
let partPos = getBidiPartAt(order, pos.ch)
side = partPos % 2 ? "right" : "left"
@@ -356,45 +391,63 @@ function posToDOM(cm, pos) {
return result
}
+function isInGutter(node) {
+ for (let scan = node; scan; scan = scan.parentNode)
+ if (/CodeMirror-gutter-wrapper/.test(scan.className)) return true
+ return false
+}
+
function badPos(pos, bad) { if (bad) pos.bad = true; return pos }
function domTextBetween(cm, from, to, fromLine, toLine) {
- let text = "", closing = false, lineSep = cm.doc.lineSeparator()
+ let text = "", closing = false, lineSep = cm.doc.lineSeparator(), extraLinebreak = false
function recognizeMarker(id) { return marker => marker.id == id }
+ function close() {
+ if (closing) {
+ text += lineSep
+ if (extraLinebreak) text += lineSep
+ closing = extraLinebreak = false
+ }
+ }
+ function addText(str) {
+ if (str) {
+ close()
+ text += str
+ }
+ }
function walk(node) {
if (node.nodeType == 1) {
let cmText = node.getAttribute("cm-text")
- if (cmText != null) {
- if (cmText == "") text += node.textContent.replace(/\u200b/g, "")
- else text += cmText
+ if (cmText) {
+ addText(cmText)
return
}
let markerID = node.getAttribute("cm-marker"), range
if (markerID) {
let found = cm.findMarks(Pos(fromLine, 0), Pos(toLine + 1, 0), recognizeMarker(+markerID))
- if (found.length && (range = found[0].find()))
- text += getBetween(cm.doc, range.from, range.to).join(lineSep)
+ if (found.length && (range = found[0].find(0)))
+ addText(getBetween(cm.doc, range.from, range.to).join(lineSep))
return
}
if (node.getAttribute("contenteditable") == "false") return
+ let isBlock = /^(pre|div|p|li|table|br)$/i.test(node.nodeName)
+ if (!/^br$/i.test(node.nodeName) && node.textContent.length == 0) return
+
+ if (isBlock) close()
for (let i = 0; i < node.childNodes.length; i++)
walk(node.childNodes[i])
- if (/^(pre|div|p)$/i.test(node.nodeName))
- closing = true
+
+ if (/^(pre|p)$/i.test(node.nodeName)) extraLinebreak = true
+ if (isBlock) closing = true
} else if (node.nodeType == 3) {
- let val = node.nodeValue
- if (!val) return
- if (closing) {
- text += lineSep
- closing = false
- }
- text += val
+ addText(node.nodeValue.replace(/\u200b/g, "").replace(/\u00a0/g, " "))
}
}
for (;;) {
walk(from)
if (from == to) break
from = from.nextSibling
+ extraLinebreak = false
}
return text
}
diff --git a/js/codemirror-5.23.0/src/input/TextareaInput.js b/js/codemirror-5.39.0/src/input/TextareaInput.js
similarity index 89%
rename from js/codemirror-5.23.0/src/input/TextareaInput.js
rename to js/codemirror-5.39.0/src/input/TextareaInput.js
index 28b3327..adfa360 100644
--- a/js/codemirror-5.23.0/src/input/TextareaInput.js
+++ b/js/codemirror-5.39.0/src/input/TextareaInput.js
@@ -1,15 +1,15 @@
-import { operation, runInOp } from "../display/operations"
-import { prepareSelection } from "../display/selection"
-import { applyTextInput, copyableRanges, handlePaste, hiddenTextarea, lastCopied, setLastCopied } from "./input"
-import { cursorCoords, posFromMouse } from "../measurement/position_measurement"
-import { eventInWidget } from "../measurement/widgets"
-import { simpleSelection } from "../model/selection"
-import { selectAll, setSelection } from "../model/selection_updates"
-import { captureRightClick, ie, ie_version, ios, mac, mobile, presto, webkit } from "../util/browser"
-import { activeElt, removeChildrenAndAdd, selectInput } from "../util/dom"
-import { e_preventDefault, e_stop, off, on, signalDOMEvent } from "../util/event"
-import { hasCopyEvent, hasSelection } from "../util/feature_detection"
-import { Delayed, sel_dontScroll } from "../util/misc"
+import { operation, runInOp } from "../display/operations.js"
+import { prepareSelection } from "../display/selection.js"
+import { applyTextInput, copyableRanges, handlePaste, hiddenTextarea, setLastCopied } from "./input.js"
+import { cursorCoords, posFromMouse } from "../measurement/position_measurement.js"
+import { eventInWidget } from "../measurement/widgets.js"
+import { simpleSelection } from "../model/selection.js"
+import { selectAll, setSelection } from "../model/selection_updates.js"
+import { captureRightClick, ie, ie_version, ios, mac, mobile, presto, webkit } from "../util/browser.js"
+import { activeElt, removeChildrenAndAdd, selectInput } from "../util/dom.js"
+import { e_preventDefault, e_stop, off, on, signalDOMEvent } from "../util/event.js"
+import { hasSelection } from "../util/feature_detection.js"
+import { Delayed, sel_dontScroll } from "../util/misc.js"
// TEXTAREA INPUT STYLE
@@ -25,9 +25,6 @@ export default class TextareaInput {
this.pollingFast = false
// Self-resetting timeout for the poller
this.polling = new Delayed()
- // Tracks when input.reset has punted to just putting a short
- // string into the textarea instead of the full selection.
- this.inaccurateSelection = false
// Used to work around IE issue with selection being forgotten when focus moves away from textarea
this.hasSelection = false
this.composing = null
@@ -35,13 +32,10 @@ export default class TextareaInput {
init(display) {
let input = this, cm = this.cm
+ this.createField(display)
+ const te = this.textarea
- // Wraps and hides input textarea
- let div = this.wrapper = hiddenTextarea()
- // The semihidden textarea that is focused when the editor is
- // focused, and receives input.
- let te = this.textarea = div.firstChild
- display.wrapper.insertBefore(div, display.wrapper.firstChild)
+ display.wrapper.insertBefore(this.wrapper, display.wrapper.firstChild)
// Needed to hide big blue blinking cursor on Mobile Safari (doesn't seem to work in iOS 8 anymore)
if (ios) te.style.width = "0px"
@@ -62,12 +56,6 @@ export default class TextareaInput {
if (signalDOMEvent(cm, e)) return
if (cm.somethingSelected()) {
setLastCopied({lineWise: false, text: cm.getSelections()})
- if (input.inaccurateSelection) {
- input.prevInput = ""
- input.inaccurateSelection = false
- te.value = lastCopied.text.join("\n")
- selectInput(te)
- }
} else if (!cm.options.lineWiseCopyCut) {
return
} else {
@@ -114,6 +102,14 @@ export default class TextareaInput {
})
}
+ createField(_display) {
+ // Wraps and hides input textarea
+ this.wrapper = hiddenTextarea()
+ // The semihidden textarea that is focused when the editor is
+ // focused, and receives input.
+ this.textarea = this.wrapper.firstChild
+ }
+
prepareSelection() {
// Redraw the selection and/or cursor
let cm = this.cm, display = cm.display, doc = cm.doc
@@ -145,14 +141,11 @@ export default class TextareaInput {
// Reset the input to correspond to the selection (or to be empty,
// when not typing and nothing is selected)
reset(typing) {
- if (this.contextMenuPending) return
- let minimal, selected, cm = this.cm, doc = cm.doc
+ if (this.contextMenuPending || this.composing) return
+ let cm = this.cm
if (cm.somethingSelected()) {
this.prevInput = ""
- let range = doc.sel.primary()
- minimal = hasCopyEvent &&
- (range.to().line - range.from().line > 100 || (selected = cm.getSelection()).length > 1000)
- let content = minimal ? "-" : selected || cm.getSelection()
+ let content = cm.getSelection()
this.textarea.value = content
if (cm.state.focused) selectInput(this.textarea)
if (ie && ie_version >= 9) this.hasSelection = content
@@ -160,7 +153,6 @@ export default class TextareaInput {
this.prevInput = this.textarea.value = ""
if (ie && ie_version >= 9) this.hasSelection = null
}
- this.inaccurateSelection = minimal
}
getField() { return this.textarea }
@@ -326,10 +318,14 @@ export default class TextareaInput {
if (!ie || (ie && ie_version < 9)) prepareSelectAllHack()
let i = 0, poll = () => {
if (display.selForContextMenu == cm.doc.sel && te.selectionStart == 0 &&
- te.selectionEnd > 0 && input.prevInput == "\u200b")
+ te.selectionEnd > 0 && input.prevInput == "\u200b") {
operation(cm, selectAll)(cm)
- else if (i++ < 10) display.detectingSelectAll = setTimeout(poll, 500)
- else display.input.reset()
+ } else if (i++ < 10) {
+ display.detectingSelectAll = setTimeout(poll, 500)
+ } else {
+ display.selForContextMenu = null
+ display.input.reset()
+ }
}
display.detectingSelectAll = setTimeout(poll, 200)
}
@@ -350,6 +346,7 @@ export default class TextareaInput {
readOnlyChanged(val) {
if (!val) this.reset()
+ this.textarea.disabled = val == "nocursor"
}
setUneditable() {}
diff --git a/js/codemirror-5.23.0/src/input/indent.js b/js/codemirror-5.39.0/src/input/indent.js
similarity index 84%
rename from js/codemirror-5.23.0/src/input/indent.js
rename to js/codemirror-5.39.0/src/input/indent.js
index 2c1755e..c88772c 100644
--- a/js/codemirror-5.23.0/src/input/indent.js
+++ b/js/codemirror-5.39.0/src/input/indent.js
@@ -1,10 +1,10 @@
-import { getStateBefore } from "../line/highlight"
-import { Pos } from "../line/pos"
-import { getLine } from "../line/utils_line"
-import { replaceRange } from "../model/changes"
-import { Range } from "../model/selection"
-import { replaceOneSelection } from "../model/selection_updates"
-import { countColumn, Pass, spaceStr } from "../util/misc"
+import { getContextBefore } from "../line/highlight.js"
+import { Pos } from "../line/pos.js"
+import { getLine } from "../line/utils_line.js"
+import { replaceRange } from "../model/changes.js"
+import { Range } from "../model/selection.js"
+import { replaceOneSelection } from "../model/selection_updates.js"
+import { countColumn, Pass, spaceStr } from "../util/misc.js"
// Indent the given line. The how parameter can be "smart",
// "add"/null, "subtract", or "prev". When aggressive is false
@@ -18,7 +18,7 @@ export function indentLine(cm, n, how, aggressive) {
// Fall back to "prev" when the mode doesn't have an indentation
// method.
if (!doc.mode.indent) how = "prev"
- else state = getStateBefore(cm, n)
+ else state = getContextBefore(cm, n).state
}
let tabSize = cm.options.tabSize
diff --git a/js/codemirror-5.23.0/src/input/input.js b/js/codemirror-5.39.0/src/input/input.js
similarity index 86%
rename from js/codemirror-5.23.0/src/input/input.js
rename to js/codemirror-5.39.0/src/input/input.js
index 57e4ea5..0ca53ad 100644
--- a/js/codemirror-5.23.0/src/input/input.js
+++ b/js/codemirror-5.39.0/src/input/input.js
@@ -1,15 +1,15 @@
-import { runInOp } from "../display/operations"
-import { ensureCursorVisible } from "../display/scrolling"
-import { Pos } from "../line/pos"
-import { getLine } from "../line/utils_line"
-import { makeChange } from "../model/changes"
-import { ios, webkit } from "../util/browser"
-import { elt } from "../util/dom"
-import { lst, map } from "../util/misc"
-import { signalLater } from "../util/operation_group"
-import { splitLinesAuto } from "../util/feature_detection"
+import { runInOp } from "../display/operations.js"
+import { ensureCursorVisible } from "../display/scrolling.js"
+import { Pos } from "../line/pos.js"
+import { getLine } from "../line/utils_line.js"
+import { makeChange } from "../model/changes.js"
+import { ios, webkit } from "../util/browser.js"
+import { elt } from "../util/dom.js"
+import { lst, map } from "../util/misc.js"
+import { signalLater } from "../util/operation_group.js"
+import { splitLinesAuto } from "../util/feature_detection.js"
-import { indentLine } from "./indent"
+import { indentLine } from "./indent.js"
// This will be set to a {lineWise: bool, text: [string]} object, so
// that, when pasting, we know what kind of selections the copied
@@ -27,7 +27,7 @@ export function applyTextInput(cm, inserted, deleted, sel, origin) {
let paste = cm.state.pasteIncoming || origin == "paste"
let textLines = splitLinesAuto(inserted), multiPaste = null
- // When pasing N lines into N selections, insert one line per selection
+ // When pasting N lines into N selections, insert one line per selection
if (paste && sel.ranges.length > 1) {
if (lastCopied && lastCopied.text.join("\n") == inserted) {
if (sel.ranges.length % lastCopied.text.length == 0) {
@@ -35,7 +35,7 @@ export function applyTextInput(cm, inserted, deleted, sel, origin) {
for (let i = 0; i < lastCopied.text.length; i++)
multiPaste.push(doc.splitLines(lastCopied.text[i]))
}
- } else if (textLines.length == sel.ranges.length) {
+ } else if (textLines.length == sel.ranges.length && cm.options.pasteLinesPerSelection) {
multiPaste = map(textLines, l => [l])
}
}
diff --git a/js/codemirror-5.23.0/src/input/keymap.js b/js/codemirror-5.39.0/src/input/keymap.js
similarity index 91%
rename from js/codemirror-5.23.0/src/input/keymap.js
rename to js/codemirror-5.39.0/src/input/keymap.js
index 3a107bb..046b350 100644
--- a/js/codemirror-5.23.0/src/input/keymap.js
+++ b/js/codemirror-5.39.0/src/input/keymap.js
@@ -1,7 +1,7 @@
-import { flipCtrlCmd, mac, presto } from "../util/browser"
-import { map } from "../util/misc"
+import { flipCtrlCmd, mac, presto } from "../util/browser.js"
+import { map } from "../util/misc.js"
-import { keyNames } from "./keynames"
+import { keyNames } from "./keynames.js"
export let keyMap = {}
@@ -24,7 +24,7 @@ keyMap.pcDefault = {
"Ctrl-G": "findNext", "Shift-Ctrl-G": "findPrev", "Shift-Ctrl-F": "replace", "Shift-Ctrl-R": "replaceAll",
"Ctrl-[": "indentLess", "Ctrl-]": "indentMore",
"Ctrl-U": "undoSelection", "Shift-Ctrl-U": "redoSelection", "Alt-U": "redoSelection",
- fallthrough: "basic"
+ "fallthrough": "basic"
}
// Very basic readline/emacs-style bindings, which are standard on Mac.
keyMap.emacsy = {
@@ -42,7 +42,7 @@ keyMap.macDefault = {
"Cmd-G": "findNext", "Shift-Cmd-G": "findPrev", "Cmd-Alt-F": "replace", "Shift-Cmd-Alt-F": "replaceAll",
"Cmd-[": "indentLess", "Cmd-]": "indentMore", "Cmd-Backspace": "delWrappedLineLeft", "Cmd-Delete": "delWrappedLineRight",
"Cmd-U": "undoSelection", "Shift-Cmd-U": "redoSelection", "Ctrl-Up": "goDocStart", "Ctrl-Down": "goDocEnd",
- fallthrough: ["basic", "emacsy"]
+ "fallthrough": ["basic", "emacsy"]
}
keyMap["default"] = mac ? keyMap.macDefault : keyMap.pcDefault
@@ -123,11 +123,8 @@ export function isModifierKey(value) {
return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod"
}
-// Look up the name of a key as indicated by an event object.
-export function keyName(event, noShift) {
- if (presto && event.keyCode == 34 && event["char"]) return false
- let base = keyNames[event.keyCode], name = base
- if (name == null || event.altGraphKey) return false
+export function addModifierNames(name, event, noShift) {
+ let base = name
if (event.altKey && base != "Alt") name = "Alt-" + name
if ((flipCtrlCmd ? event.metaKey : event.ctrlKey) && base != "Ctrl") name = "Ctrl-" + name
if ((flipCtrlCmd ? event.ctrlKey : event.metaKey) && base != "Cmd") name = "Cmd-" + name
@@ -135,6 +132,17 @@ export function keyName(event, noShift) {
return name
}
+// Look up the name of a key as indicated by an event object.
+export function keyName(event, noShift) {
+ if (presto && event.keyCode == 34 && event["char"]) return false
+ let name = keyNames[event.keyCode]
+ if (name == null || event.altGraphKey) return false
+ // Ctrl-ScrollLock has keyCode 3, same as Ctrl-Pause,
+ // so we'll use event.code when available (Chrome 48+, FF 38+, Safari 10.1+)
+ if (event.keyCode == 3 && event.code) name = event.code
+ return addModifierNames(name, event, noShift)
+}
+
export function getKeyMap(val) {
return typeof val == "string" ? keyMap[val] : val
}
diff --git a/js/codemirror-5.23.0/src/input/keynames.js b/js/codemirror-5.39.0/src/input/keynames.js
similarity index 91%
rename from js/codemirror-5.23.0/src/input/keynames.js
rename to js/codemirror-5.39.0/src/input/keynames.js
index 66bc800..9a61d15 100644
--- a/js/codemirror-5.23.0/src/input/keynames.js
+++ b/js/codemirror-5.39.0/src/input/keynames.js
@@ -1,9 +1,9 @@
export let keyNames = {
- 3: "Enter", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt",
+ 3: "Pause", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt",
19: "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End",
36: "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "PrintScrn", 45: "Insert",
46: "Delete", 59: ";", 61: "=", 91: "Mod", 92: "Mod", 93: "Mod",
- 106: "*", 107: "=", 109: "-", 110: ".", 111: "/", 127: "Delete",
+ 106: "*", 107: "=", 109: "-", 110: ".", 111: "/", 127: "Delete", 145: "ScrollLock",
173: "-", 186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\",
221: "]", 222: "'", 63232: "Up", 63233: "Down", 63234: "Left", 63235: "Right", 63272: "Delete",
63273: "Home", 63275: "End", 63276: "PageUp", 63277: "PageDown", 63302: "Insert"
diff --git a/js/codemirror-5.39.0/src/input/movement.js b/js/codemirror-5.39.0/src/input/movement.js
new file mode 100644
index 0000000..8d50fd2
--- /dev/null
+++ b/js/codemirror-5.39.0/src/input/movement.js
@@ -0,0 +1,110 @@
+import { Pos } from "../line/pos.js"
+import { prepareMeasureForLine, measureCharPrepared, wrappedLineExtentChar } from "../measurement/position_measurement.js"
+import { getBidiPartAt, getOrder } from "../util/bidi.js"
+import { findFirst, lst, skipExtendingChars } from "../util/misc.js"
+
+function moveCharLogically(line, ch, dir) {
+ let target = skipExtendingChars(line.text, ch + dir, dir)
+ return target < 0 || target > line.text.length ? null : target
+}
+
+export function moveLogically(line, start, dir) {
+ let ch = moveCharLogically(line, start.ch, dir)
+ return ch == null ? null : new Pos(start.line, ch, dir < 0 ? "after" : "before")
+}
+
+export function endOfLine(visually, cm, lineObj, lineNo, dir) {
+ if (visually) {
+ let order = getOrder(lineObj, cm.doc.direction)
+ if (order) {
+ let part = dir < 0 ? lst(order) : order[0]
+ let moveInStorageOrder = (dir < 0) == (part.level == 1)
+ let sticky = moveInStorageOrder ? "after" : "before"
+ let ch
+ // With a wrapped rtl chunk (possibly spanning multiple bidi parts),
+ // it could be that the last bidi part is not on the last visual line,
+ // since visual lines contain content order-consecutive chunks.
+ // Thus, in rtl, we are looking for the first (content-order) character
+ // in the rtl chunk that is on the last line (that is, the same line
+ // as the last (content-order) character).
+ if (part.level > 0 || cm.doc.direction == "rtl") {
+ let prep = prepareMeasureForLine(cm, lineObj)
+ ch = dir < 0 ? lineObj.text.length - 1 : 0
+ let targetTop = measureCharPrepared(cm, prep, ch).top
+ ch = findFirst(ch => measureCharPrepared(cm, prep, ch).top == targetTop, (dir < 0) == (part.level == 1) ? part.from : part.to - 1, ch)
+ if (sticky == "before") ch = moveCharLogically(lineObj, ch, 1)
+ } else ch = dir < 0 ? part.to : part.from
+ return new Pos(lineNo, ch, sticky)
+ }
+ }
+ return new Pos(lineNo, dir < 0 ? lineObj.text.length : 0, dir < 0 ? "before" : "after")
+}
+
+export function moveVisually(cm, line, start, dir) {
+ let bidi = getOrder(line, cm.doc.direction)
+ if (!bidi) return moveLogically(line, start, dir)
+ if (start.ch >= line.text.length) {
+ start.ch = line.text.length
+ start.sticky = "before"
+ } else if (start.ch <= 0) {
+ start.ch = 0
+ start.sticky = "after"
+ }
+ let partPos = getBidiPartAt(bidi, start.ch, start.sticky), part = bidi[partPos]
+ if (cm.doc.direction == "ltr" && part.level % 2 == 0 && (dir > 0 ? part.to > start.ch : part.from < start.ch)) {
+ // Case 1: We move within an ltr part in an ltr editor. Even with wrapped lines,
+ // nothing interesting happens.
+ return moveLogically(line, start, dir)
+ }
+
+ let mv = (pos, dir) => moveCharLogically(line, pos instanceof Pos ? pos.ch : pos, dir)
+ let prep
+ let getWrappedLineExtent = ch => {
+ if (!cm.options.lineWrapping) return {begin: 0, end: line.text.length}
+ prep = prep || prepareMeasureForLine(cm, line)
+ return wrappedLineExtentChar(cm, line, prep, ch)
+ }
+ let wrappedLineExtent = getWrappedLineExtent(start.sticky == "before" ? mv(start, -1) : start.ch)
+
+ if (cm.doc.direction == "rtl" || part.level == 1) {
+ let moveInStorageOrder = (part.level == 1) == (dir < 0)
+ let ch = mv(start, moveInStorageOrder ? 1 : -1)
+ if (ch != null && (!moveInStorageOrder ? ch >= part.from && ch >= wrappedLineExtent.begin : ch <= part.to && ch <= wrappedLineExtent.end)) {
+ // Case 2: We move within an rtl part or in an rtl editor on the same visual line
+ let sticky = moveInStorageOrder ? "before" : "after"
+ return new Pos(start.line, ch, sticky)
+ }
+ }
+
+ // Case 3: Could not move within this bidi part in this visual line, so leave
+ // the current bidi part
+
+ let searchInVisualLine = (partPos, dir, wrappedLineExtent) => {
+ let getRes = (ch, moveInStorageOrder) => moveInStorageOrder
+ ? new Pos(start.line, mv(ch, 1), "before")
+ : new Pos(start.line, ch, "after")
+
+ for (; partPos >= 0 && partPos < bidi.length; partPos += dir) {
+ let part = bidi[partPos]
+ let moveInStorageOrder = (dir > 0) == (part.level != 1)
+ let ch = moveInStorageOrder ? wrappedLineExtent.begin : mv(wrappedLineExtent.end, -1)
+ if (part.from <= ch && ch < part.to) return getRes(ch, moveInStorageOrder)
+ ch = moveInStorageOrder ? part.from : mv(part.to, -1)
+ if (wrappedLineExtent.begin <= ch && ch < wrappedLineExtent.end) return getRes(ch, moveInStorageOrder)
+ }
+ }
+
+ // Case 3a: Look for other bidi parts on the same visual line
+ let res = searchInVisualLine(partPos + dir, dir, wrappedLineExtent)
+ if (res) return res
+
+ // Case 3b: Look for other bidi parts on the next visual line
+ let nextCh = dir > 0 ? wrappedLineExtent.end : mv(wrappedLineExtent.begin, -1)
+ if (nextCh != null && !(dir > 0 && nextCh == line.text.length)) {
+ res = searchInVisualLine(dir > 0 ? 0 : bidi.length - 1, dir, getWrappedLineExtent(nextCh))
+ if (res) return res
+ }
+
+ // Case 4: Nowhere to move
+ return null
+}
diff --git a/js/codemirror-5.23.0/src/line/highlight.js b/js/codemirror-5.39.0/src/line/highlight.js
similarity index 50%
rename from js/codemirror-5.23.0/src/line/highlight.js
rename to js/codemirror-5.39.0/src/line/highlight.js
index dcf020a..79f0884 100644
--- a/js/codemirror-5.23.0/src/line/highlight.js
+++ b/js/codemirror-5.39.0/src/line/highlight.js
@@ -1,26 +1,80 @@
-import { countColumn } from "../util/misc"
-import { copyState, innerMode, startState } from "../modes"
-import StringStream from "../util/StringStream"
+import { countColumn } from "../util/misc.js"
+import { copyState, innerMode, startState } from "../modes.js"
+import StringStream from "../util/StringStream.js"
+
+import { getLine, lineNo } from "./utils_line.js"
+import { clipPos } from "./pos.js"
+
+class SavedContext {
+ constructor(state, lookAhead) {
+ this.state = state
+ this.lookAhead = lookAhead
+ }
+}
+
+class Context {
+ constructor(doc, state, line, lookAhead) {
+ this.state = state
+ this.doc = doc
+ this.line = line
+ this.maxLookAhead = lookAhead || 0
+ this.baseTokens = null
+ this.baseTokenPos = 1
+ }
+
+ lookAhead(n) {
+ let line = this.doc.getLine(this.line + n)
+ if (line != null && n > this.maxLookAhead) this.maxLookAhead = n
+ return line
+ }
+
+ baseToken(n) {
+ if (!this.baseTokens) return null
+ while (this.baseTokens[this.baseTokenPos] <= n)
+ this.baseTokenPos += 2
+ let type = this.baseTokens[this.baseTokenPos + 1]
+ return {type: type && type.replace(/( |^)overlay .*/, ""),
+ size: this.baseTokens[this.baseTokenPos] - n}
+ }
+
+ nextLine() {
+ this.line++
+ if (this.maxLookAhead > 0) this.maxLookAhead--
+ }
+
+ static fromSaved(doc, saved, line) {
+ if (saved instanceof SavedContext)
+ return new Context(doc, copyState(doc.mode, saved.state), line, saved.lookAhead)
+ else
+ return new Context(doc, copyState(doc.mode, saved), line)
+ }
+
+ save(copy) {
+ let state = copy !== false ? copyState(this.doc.mode, this.state) : this.state
+ return this.maxLookAhead > 0 ? new SavedContext(state, this.maxLookAhead) : state
+ }
+}
-import { getLine, lineNo } from "./utils_line"
-import { clipPos } from "./pos"
// Compute a style array (an array starting with a mode generation
// -- for invalidation -- followed by pairs of end positions and
// style strings), which is used to highlight the tokens on the
// line.
-export function highlightLine(cm, line, state, forceToEnd) {
+export function highlightLine(cm, line, context, forceToEnd) {
// A styles array always starts with a number identifying the
// mode/overlays that it is based on (for easy invalidation).
let st = [cm.state.modeGen], lineClasses = {}
// Compute the base array of styles
- runMode(cm, line.text, cm.doc.mode, state, (end, style) => st.push(end, style),
- lineClasses, forceToEnd)
+ runMode(cm, line.text, cm.doc.mode, context, (end, style) => st.push(end, style),
+ lineClasses, forceToEnd)
+ let state = context.state
// Run overlays, adjust style array.
for (let o = 0; o < cm.state.overlays.length; ++o) {
+ context.baseTokens = st
let overlay = cm.state.overlays[o], i = 1, at = 0
- runMode(cm, line.text, overlay.mode, true, (end, style) => {
+ context.state = true
+ runMode(cm, line.text, overlay.mode, context, (end, style) => {
let start = i
// Ensure there's a token end at the current position, and that i points at it
while (at < end) {
@@ -41,6 +95,9 @@ export function highlightLine(cm, line, state, forceToEnd) {
}
}
}, lineClasses)
+ context.state = state
+ context.baseTokens = null
+ context.baseTokenPos = 1
}
return {styles: st, classes: lineClasses.bgClass || lineClasses.textClass ? lineClasses : null}
@@ -48,43 +105,47 @@ export function highlightLine(cm, line, state, forceToEnd) {
export function getLineStyles(cm, line, updateFrontier) {
if (!line.styles || line.styles[0] != cm.state.modeGen) {
- let state = getStateBefore(cm, lineNo(line))
- let result = highlightLine(cm, line, line.text.length > cm.options.maxHighlightLength ? copyState(cm.doc.mode, state) : state)
- line.stateAfter = state
+ let context = getContextBefore(cm, lineNo(line))
+ let resetState = line.text.length > cm.options.maxHighlightLength && copyState(cm.doc.mode, context.state)
+ let result = highlightLine(cm, line, context)
+ if (resetState) context.state = resetState
+ line.stateAfter = context.save(!resetState)
line.styles = result.styles
if (result.classes) line.styleClasses = result.classes
else if (line.styleClasses) line.styleClasses = null
- if (updateFrontier === cm.doc.frontier) cm.doc.frontier++
+ if (updateFrontier === cm.doc.highlightFrontier)
+ cm.doc.modeFrontier = Math.max(cm.doc.modeFrontier, ++cm.doc.highlightFrontier)
}
return line.styles
}
-export function getStateBefore(cm, n, precise) {
+export function getContextBefore(cm, n, precise) {
let doc = cm.doc, display = cm.display
- if (!doc.mode.startState) return true
- let pos = findStartLine(cm, n, precise), state = pos > doc.first && getLine(doc, pos-1).stateAfter
- if (!state) state = startState(doc.mode)
- else state = copyState(doc.mode, state)
- doc.iter(pos, n, line => {
- processLine(cm, line.text, state)
- let save = pos == n - 1 || pos % 5 == 0 || pos >= display.viewFrom && pos < display.viewTo
- line.stateAfter = save ? copyState(doc.mode, state) : null
- ++pos
+ if (!doc.mode.startState) return new Context(doc, true, n)
+ let start = findStartLine(cm, n, precise)
+ let saved = start > doc.first && getLine(doc, start - 1).stateAfter
+ let context = saved ? Context.fromSaved(doc, saved, start) : new Context(doc, startState(doc.mode), start)
+
+ doc.iter(start, n, line => {
+ processLine(cm, line.text, context)
+ let pos = context.line
+ line.stateAfter = pos == n - 1 || pos % 5 == 0 || pos >= display.viewFrom && pos < display.viewTo ? context.save() : null
+ context.nextLine()
})
- if (precise) doc.frontier = pos
- return state
+ if (precise) doc.modeFrontier = context.line
+ return context
}
// Lightweight form of highlight -- proceed over this line and
// update state, but don't save a style array. Used for lines that
// aren't currently visible.
-export function processLine(cm, text, state, startAt) {
+export function processLine(cm, text, context, startAt) {
let mode = cm.doc.mode
- let stream = new StringStream(text, cm.options.tabSize)
+ let stream = new StringStream(text, cm.options.tabSize, context)
stream.start = stream.pos = startAt || 0
- if (text == "") callBlankLine(mode, state)
+ if (text == "") callBlankLine(mode, context.state)
while (!stream.eol()) {
- readToken(mode, stream, state)
+ readToken(mode, stream, context.state)
stream.start = stream.pos
}
}
@@ -105,26 +166,28 @@ export function readToken(mode, stream, state, inner) {
throw new Error("Mode " + mode.name + " failed to advance stream.")
}
+class Token {
+ constructor(stream, type, state) {
+ this.start = stream.start; this.end = stream.pos
+ this.string = stream.current()
+ this.type = type || null
+ this.state = state
+ }
+}
+
// Utility for getTokenAt and getLineTokens
export function takeToken(cm, pos, precise, asArray) {
- let getObj = copy => ({
- start: stream.start, end: stream.pos,
- string: stream.current(),
- type: style || null,
- state: copy ? copyState(doc.mode, state) : state
- })
-
let doc = cm.doc, mode = doc.mode, style
pos = clipPos(doc, pos)
- let line = getLine(doc, pos.line), state = getStateBefore(cm, pos.line, precise)
- let stream = new StringStream(line.text, cm.options.tabSize), tokens
+ let line = getLine(doc, pos.line), context = getContextBefore(cm, pos.line, precise)
+ let stream = new StringStream(line.text, cm.options.tabSize, context), tokens
if (asArray) tokens = []
while ((asArray || stream.pos < pos.ch) && !stream.eol()) {
stream.start = stream.pos
- style = readToken(mode, stream, state)
- if (asArray) tokens.push(getObj(true))
+ style = readToken(mode, stream, context.state)
+ if (asArray) tokens.push(new Token(stream, style, copyState(doc.mode, context.state)))
}
- return asArray ? tokens : getObj()
+ return asArray ? tokens : new Token(stream, style, context.state)
}
function extractLineClasses(type, output) {
@@ -142,21 +205,21 @@ function extractLineClasses(type, output) {
}
// Run the given mode's parser over a line, calling f for each token.
-function runMode(cm, text, mode, state, f, lineClasses, forceToEnd) {
+function runMode(cm, text, mode, context, f, lineClasses, forceToEnd) {
let flattenSpans = mode.flattenSpans
if (flattenSpans == null) flattenSpans = cm.options.flattenSpans
let curStart = 0, curStyle = null
- let stream = new StringStream(text, cm.options.tabSize), style
+ let stream = new StringStream(text, cm.options.tabSize, context), style
let inner = cm.options.addModeClass && [null]
- if (text == "") extractLineClasses(callBlankLine(mode, state), lineClasses)
+ if (text == "") extractLineClasses(callBlankLine(mode, context.state), lineClasses)
while (!stream.eol()) {
if (stream.pos > cm.options.maxHighlightLength) {
flattenSpans = false
- if (forceToEnd) processLine(cm, text, state, stream.pos)
+ if (forceToEnd) processLine(cm, text, context, stream.pos)
stream.pos = text.length
style = null
} else {
- style = extractLineClasses(readToken(mode, stream, state, inner), lineClasses)
+ style = extractLineClasses(readToken(mode, stream, context.state, inner), lineClasses)
}
if (inner) {
let mName = inner[0].name
@@ -191,8 +254,9 @@ function findStartLine(cm, n, precise) {
let lim = precise ? -1 : n - (cm.doc.mode.innerMode ? 1000 : 100)
for (let search = n; search > lim; --search) {
if (search <= doc.first) return doc.first
- let line = getLine(doc, search - 1)
- if (line.stateAfter && (!precise || search <= doc.frontier)) return search
+ let line = getLine(doc, search - 1), after = line.stateAfter
+ if (after && (!precise || search + (after instanceof SavedContext ? after.lookAhead : 0) <= doc.modeFrontier))
+ return search
let indented = countColumn(line.text, null, cm.options.tabSize)
if (minline == null || minindent > indented) {
minline = search - 1
@@ -201,3 +265,20 @@ function findStartLine(cm, n, precise) {
}
return minline
}
+
+export function retreatFrontier(doc, n) {
+ doc.modeFrontier = Math.min(doc.modeFrontier, n)
+ if (doc.highlightFrontier < n - 10) return
+ let start = doc.first
+ for (let line = n - 1; line > start; line--) {
+ let saved = getLine(doc, line).stateAfter
+ // change is on 3
+ // state on line 1 looked ahead 2 -- so saw 3
+ // test 1 + 2 < 3 should cover this
+ if (saved && (!(saved instanceof SavedContext) || line + saved.lookAhead < n)) {
+ start = line + 1
+ break
+ }
+ }
+ doc.highlightFrontier = Math.min(doc.highlightFrontier, start)
+}
diff --git a/js/codemirror-5.23.0/src/line/line_data.js b/js/codemirror-5.39.0/src/line/line_data.js
similarity index 93%
rename from js/codemirror-5.23.0/src/line/line_data.js
rename to js/codemirror-5.39.0/src/line/line_data.js
index 7583c34..74acdaf 100644
--- a/js/codemirror-5.23.0/src/line/line_data.js
+++ b/js/codemirror-5.39.0/src/line/line_data.js
@@ -1,25 +1,28 @@
-import { getOrder } from "../util/bidi"
-import { ie, ie_version, webkit } from "../util/browser"
-import { elt, joinClasses } from "../util/dom"
-import { eventMixin, signal } from "../util/event"
-import { hasBadBidiRects, zeroWidthElement } from "../util/feature_detection"
-import { lst, spaceStr } from "../util/misc"
+import { getOrder } from "../util/bidi.js"
+import { ie, ie_version, webkit } from "../util/browser.js"
+import { elt, eltP, joinClasses } from "../util/dom.js"
+import { eventMixin, signal } from "../util/event.js"
+import { hasBadBidiRects, zeroWidthElement } from "../util/feature_detection.js"
+import { lst, spaceStr } from "../util/misc.js"
-import { getLineStyles } from "./highlight"
-import { attachMarkedSpans, compareCollapsedMarkers, detachMarkedSpans, lineIsHidden, visualLineContinued } from "./spans"
-import { getLine, lineNo, updateLineHeight } from "./utils_line"
+import { getLineStyles } from "./highlight.js"
+import { attachMarkedSpans, compareCollapsedMarkers, detachMarkedSpans, lineIsHidden, visualLineContinued } from "./spans.js"
+import { getLine, lineNo, updateLineHeight } from "./utils_line.js"
// LINE DATA STRUCTURE
// Line objects. These hold state related to a line, including
// highlighting info (the styles array).
-export function Line(text, markedSpans, estimateHeight) {
- this.text = text
- attachMarkedSpans(this, markedSpans)
- this.height = estimateHeight ? estimateHeight(this) : 1
+export class Line {
+ constructor(text, markedSpans, estimateHeight) {
+ this.text = text
+ attachMarkedSpans(this, markedSpans)
+ this.height = estimateHeight ? estimateHeight(this) : 1
+ }
+
+ lineNo() { return lineNo(this) }
}
eventMixin(Line)
-Line.prototype.lineNo = function() { return lineNo(this) }
// Change the content (text, markers) of a line. Automatically
// invalidates cached information and tries to re-estimate the
@@ -61,14 +64,11 @@ export function buildLineContent(cm, lineView) {
// The padding-right forces the element to have a 'border', which
// is needed on Webkit to be able to get line-level bounding
// rectangles for it (in measureChar).
- let content = elt("span", null, null, webkit ? "padding-right: .1px" : null)
- let builder = {pre: elt("pre", [content], "CodeMirror-line"), content: content,
+ let content = eltP("span", null, null, webkit ? "padding-right: .1px" : null)
+ let builder = {pre: eltP("pre", [content], "CodeMirror-line"), content: content,
col: 0, pos: 0, cm: cm,
trailingSpace: false,
splitSpaces: (ie || webkit) && cm.getOption("lineWrapping")}
- // hide from accessibility tree
- content.setAttribute("role", "presentation")
- builder.pre.setAttribute("role", "presentation")
lineView.measure = {}
// Iterate over the logical lines that make up this visual line.
@@ -78,7 +78,7 @@ export function buildLineContent(cm, lineView) {
builder.addToken = buildToken
// Optionally wire in some hacks into the token-rendering
// algorithm, to deal with browser quirks.
- if (hasBadBidiRects(cm.display.measure) && (order = getOrder(line)))
+ if (hasBadBidiRects(cm.display.measure) && (order = getOrder(line, cm.doc.direction)))
builder.addToken = buildTokenBadBidi(builder.addToken, order)
builder.map = []
let allowFrontierUpdate = lineView != cm.display.externalMeasured && lineNo(line)
diff --git a/js/codemirror-5.23.0/src/line/pos.js b/js/codemirror-5.39.0/src/line/pos.js
similarity index 80%
rename from js/codemirror-5.23.0/src/line/pos.js
rename to js/codemirror-5.39.0/src/line/pos.js
index 73b2e0b..2a498f8 100644
--- a/js/codemirror-5.23.0/src/line/pos.js
+++ b/js/codemirror-5.39.0/src/line/pos.js
@@ -1,15 +1,19 @@
-import { getLine } from "./utils_line"
+import { getLine } from "./utils_line.js"
// A Pos instance represents a position within the text.
-export function Pos (line, ch) {
- if (!(this instanceof Pos)) return new Pos(line, ch)
- this.line = line; this.ch = ch
+export function Pos(line, ch, sticky = null) {
+ if (!(this instanceof Pos)) return new Pos(line, ch, sticky)
+ this.line = line
+ this.ch = ch
+ this.sticky = sticky
}
// Compare two positions, return 0 if they are the same, a negative
// number when a is less, and a positive number otherwise.
export function cmp(a, b) { return a.line - b.line || a.ch - b.ch }
+export function equalCursorPos(a, b) { return a.sticky == b.sticky && cmp(a, b) == 0 }
+
export function copyPos(x) {return Pos(x.line, x.ch)}
export function maxPos(a, b) { return cmp(a, b) < 0 ? b : a }
export function minPos(a, b) { return cmp(a, b) < 0 ? a : b }
diff --git a/js/codemirror-5.23.0/src/line/saw_special_spans.js b/js/codemirror-5.39.0/src/line/saw_special_spans.js
similarity index 100%
rename from js/codemirror-5.23.0/src/line/saw_special_spans.js
rename to js/codemirror-5.39.0/src/line/saw_special_spans.js
diff --git a/js/codemirror-5.23.0/src/line/spans.js b/js/codemirror-5.39.0/src/line/spans.js
similarity index 94%
rename from js/codemirror-5.23.0/src/line/spans.js
rename to js/codemirror-5.39.0/src/line/spans.js
index 267ee71..d81dec4 100644
--- a/js/codemirror-5.23.0/src/line/spans.js
+++ b/js/codemirror-5.39.0/src/line/spans.js
@@ -1,8 +1,8 @@
-import { indexOf, lst } from "../util/misc"
+import { indexOf, lst } from "../util/misc.js"
-import { cmp } from "./pos"
-import { sawCollapsedSpans } from "./saw_special_spans"
-import { getLine, isLine, lineNo } from "./utils_line"
+import { cmp } from "./pos.js"
+import { sawCollapsedSpans } from "./saw_special_spans.js"
+import { getLine, isLine, lineNo } from "./utils_line.js"
// TEXTMARKER SPANS
@@ -163,7 +163,7 @@ export function removeReadOnlyRanges(doc, from, to) {
if (dto > 0 || !mk.inclusiveRight && !dto)
newParts.push({from: m.to, to: p.to})
parts.splice.apply(parts, newParts)
- j += newParts.length - 1
+ j += newParts.length - 3
}
}
return parts
@@ -218,6 +218,16 @@ function collapsedSpanAtSide(line, start) {
export function collapsedSpanAtStart(line) { return collapsedSpanAtSide(line, true) }
export function collapsedSpanAtEnd(line) { return collapsedSpanAtSide(line, false) }
+export function collapsedSpanAround(line, ch) {
+ let sps = sawCollapsedSpans && line.markedSpans, found
+ if (sps) for (let i = 0; i < sps.length; ++i) {
+ let sp = sps[i]
+ if (sp.marker.collapsed && (sp.from == null || sp.from < ch) && (sp.to == null || sp.to > ch) &&
+ (!found || compareCollapsedMarkers(found, sp.marker) < 0)) found = sp.marker
+ }
+ return found
+}
+
// Test whether there exists a collapsed span that partially
// overlaps (covers the start or end, but not both) of a new span.
// Such overlap is not allowed.
@@ -248,6 +258,13 @@ export function visualLine(line) {
return line
}
+export function visualLineEnd(line) {
+ let merged
+ while (merged = collapsedSpanAtEnd(line))
+ line = merged.find(1, true).line
+ return line
+}
+
// Returns an array of logical lines that continue the visual line
// started by the argument, or undefined if there are no such lines.
export function visualLineContinued(line) {
diff --git a/js/codemirror-5.23.0/src/line/utils_line.js b/js/codemirror-5.39.0/src/line/utils_line.js
similarity index 98%
rename from js/codemirror-5.23.0/src/line/utils_line.js
rename to js/codemirror-5.39.0/src/line/utils_line.js
index e4e6943..c886294 100644
--- a/js/codemirror-5.23.0/src/line/utils_line.js
+++ b/js/codemirror-5.39.0/src/line/utils_line.js
@@ -1,4 +1,4 @@
-import { indexOf } from "../util/misc"
+import { indexOf } from "../util/misc.js"
// Find the line object corresponding to the given line number.
export function getLine(doc, n) {
diff --git a/js/codemirror-5.23.0/src/measurement/position_measurement.js b/js/codemirror-5.39.0/src/measurement/position_measurement.js
similarity index 66%
rename from js/codemirror-5.23.0/src/measurement/position_measurement.js
rename to js/codemirror-5.39.0/src/measurement/position_measurement.js
index f62672c..eb9d18a 100644
--- a/js/codemirror-5.23.0/src/measurement/position_measurement.js
+++ b/js/codemirror-5.39.0/src/measurement/position_measurement.js
@@ -1,16 +1,16 @@
-import { buildLineContent, LineView } from "../line/line_data"
-import { clipPos, Pos } from "../line/pos"
-import { collapsedSpanAtEnd, heightAtLine, lineIsHidden, visualLine } from "../line/spans"
-import { getLine, lineAtHeight, lineNo, updateLineHeight } from "../line/utils_line"
-import { bidiLeft, bidiRight, bidiOther, getBidiPartAt, getOrder, lineLeft, lineRight, moveVisually } from "../util/bidi"
-import { ie, ie_version } from "../util/browser"
-import { elt, removeChildren, range, removeChildrenAndAdd } from "../util/dom"
-import { e_target } from "../util/event"
-import { hasBadZoomedRects } from "../util/feature_detection"
-import { countColumn, isExtendingChar, scrollerGap } from "../util/misc"
-import { updateLineForChanges } from "../display/update_line"
-
-import { widgetHeight } from "./widgets"
+import { buildLineContent, LineView } from "../line/line_data.js"
+import { clipPos, Pos } from "../line/pos.js"
+import { collapsedSpanAround, heightAtLine, lineIsHidden, visualLine } from "../line/spans.js"
+import { getLine, lineAtHeight, lineNo, updateLineHeight } from "../line/utils_line.js"
+import { bidiOther, getBidiPartAt, getOrder } from "../util/bidi.js"
+import { chrome, android, ie, ie_version } from "../util/browser.js"
+import { elt, removeChildren, range, removeChildrenAndAdd } from "../util/dom.js"
+import { e_target } from "../util/event.js"
+import { hasBadZoomedRects } from "../util/feature_detection.js"
+import { countColumn, findFirst, isExtendingChar, scrollerGap, skipExtendingChars } from "../util/misc.js"
+import { updateLineForChanges } from "../display/update_line.js"
+
+import { widgetHeight } from "./widgets.js"
// POSITION MEASUREMENT
@@ -102,7 +102,7 @@ export function findViewForLine(cm, lineN) {
// character. Functions like coordsChar, that need to do a lot of
// measurements in a row, can thus ensure that the set-up work is
// only done once.
-function prepareMeasureForLine(cm, line) {
+export function prepareMeasureForLine(cm, line) {
let lineN = lineNo(line)
let view = findViewForLine(cm, lineN)
if (view && !view.text) {
@@ -124,7 +124,7 @@ function prepareMeasureForLine(cm, line) {
// Given a prepared measurement object, measures the position of an
// actual character (or fetches it from the cache).
-function measureCharPrepared(cm, prepared, ch, bias, varHeight) {
+export function measureCharPrepared(cm, prepared, ch, bias, varHeight) {
if (prepared.before) ch = -1
let key = ch + (bias || ""), found
if (prepared.cache.hasOwnProperty(key)) {
@@ -280,17 +280,33 @@ export function clearCaches(cm) {
cm.display.lineNumChars = null
}
-function pageScrollX() { return window.pageXOffset || (document.documentElement || document.body).scrollLeft }
-function pageScrollY() { return window.pageYOffset || (document.documentElement || document.body).scrollTop }
+function pageScrollX() {
+ // Work around https://bugs.chromium.org/p/chromium/issues/detail?id=489206
+ // which causes page_Offset and bounding client rects to use
+ // different reference viewports and invalidate our calculations.
+ if (chrome && android) return -(document.body.getBoundingClientRect().left - parseInt(getComputedStyle(document.body).marginLeft))
+ return window.pageXOffset || (document.documentElement || document.body).scrollLeft
+}
+function pageScrollY() {
+ if (chrome && android) return -(document.body.getBoundingClientRect().top - parseInt(getComputedStyle(document.body).marginTop))
+ return window.pageYOffset || (document.documentElement || document.body).scrollTop
+}
+
+function widgetTopHeight(lineObj) {
+ let height = 0
+ if (lineObj.widgets) for (let i = 0; i < lineObj.widgets.length; ++i) if (lineObj.widgets[i].above)
+ height += widgetHeight(lineObj.widgets[i])
+ return height
+}
// Converts a {top, bottom, left, right} box from line-local
// coordinates into another coordinate system. Context may be one of
// "line", "div" (display.lineDiv), "local"./null (editor), "window",
// or "page".
export function intoCoordSystem(cm, lineObj, rect, context, includeWidgets) {
- if (!includeWidgets && lineObj.widgets) for (let i = 0; i < lineObj.widgets.length; ++i) if (lineObj.widgets[i].above) {
- let size = widgetHeight(lineObj.widgets[i])
- rect.top += size; rect.bottom += size
+ if (!includeWidgets) {
+ let height = widgetTopHeight(lineObj)
+ rect.top += height; rect.bottom += height
}
if (context == "line") return rect
if (!context) context = "local"
@@ -334,6 +350,19 @@ export function charCoords(cm, pos, context, lineObj, bias) {
// Returns a box for a given cursor position, which may have an
// 'other' property containing the position of the secondary cursor
// on a bidi boundary.
+// A cursor Pos(line, char, "before") is on the same visual line as `char - 1`
+// and after `char - 1` in writing order of `char - 1`
+// A cursor Pos(line, char, "after") is on the same visual line as `char`
+// and before `char` in writing order of `char`
+// Examples (upper-case letters are RTL, lower-case are LTR):
+// Pos(0, 1, ...)
+// before after
+// ab a|b a|b
+// aB a|B aB|
+// Ab |Ab A|b
+// AB B|A B|A
+// Every position after the last character on a line is considered to stick
+// to the last character on the line.
export function cursorCoords(cm, pos, context, lineObj, preparedMeasure, varHeight) {
lineObj = lineObj || getLine(cm.doc, pos.line)
if (!preparedMeasure) preparedMeasure = prepareMeasureForLine(cm, lineObj)
@@ -342,25 +371,24 @@ export function cursorCoords(cm, pos, context, lineObj, preparedMeasure, varHeig
if (right) m.left = m.right; else m.right = m.left
return intoCoordSystem(cm, lineObj, m, context)
}
- function getBidi(ch, partPos) {
- let part = order[partPos], right = part.level % 2
- if (ch == bidiLeft(part) && partPos && part.level < order[partPos - 1].level) {
- part = order[--partPos]
- ch = bidiRight(part) - (part.level % 2 ? 0 : 1)
- right = true
- } else if (ch == bidiRight(part) && partPos < order.length - 1 && part.level < order[partPos + 1].level) {
- part = order[++partPos]
- ch = bidiLeft(part) - part.level % 2
- right = false
- }
- if (right && ch == part.to && ch > part.from) return get(ch - 1)
- return get(ch, right)
+ let order = getOrder(lineObj, cm.doc.direction), ch = pos.ch, sticky = pos.sticky
+ if (ch >= lineObj.text.length) {
+ ch = lineObj.text.length
+ sticky = "before"
+ } else if (ch <= 0) {
+ ch = 0
+ sticky = "after"
+ }
+ if (!order) return get(sticky == "before" ? ch - 1 : ch, sticky == "before")
+
+ function getBidi(ch, partPos, invert) {
+ let part = order[partPos], right = part.level == 1
+ return get(invert ? ch - 1 : ch, right != invert)
}
- let order = getOrder(lineObj), ch = pos.ch
- if (!order) return get(ch)
- let partPos = getBidiPartAt(order, ch)
- let val = getBidi(ch, partPos)
- if (bidiOther != null) val.other = getBidi(ch, bidiOther)
+ let partPos = getBidiPartAt(order, ch, sticky)
+ let other = bidiOther
+ let val = getBidi(ch, partPos, sticky == "before")
+ if (other != null) val.other = getBidi(ch, other, sticky != "before")
return val
}
@@ -381,8 +409,8 @@ export function estimateCoords(cm, pos) {
// the right of the character position, for example). When outside
// is true, that means the coordinates lie outside the line's
// vertical range.
-function PosWithInfo(line, ch, outside, xRel) {
- let pos = Pos(line, ch)
+function PosWithInfo(line, ch, sticky, outside, xRel) {
+ let pos = Pos(line, ch, sticky)
pos.xRel = xRel
if (outside) pos.outside = true
return pos
@@ -393,75 +421,163 @@ function PosWithInfo(line, ch, outside, xRel) {
export function coordsChar(cm, x, y) {
let doc = cm.doc
y += cm.display.viewOffset
- if (y < 0) return PosWithInfo(doc.first, 0, true, -1)
+ if (y < 0) return PosWithInfo(doc.first, 0, null, true, -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, true, 1)
+ return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, null, true, 1)
if (x < 0) x = 0
let lineObj = getLine(doc, lineN)
for (;;) {
let found = coordsCharInner(cm, lineObj, lineN, x, y)
- let merged = collapsedSpanAtEnd(lineObj)
- let mergedPos = merged && merged.find(0, true)
- if (merged && (found.ch > mergedPos.from.ch || found.ch == mergedPos.from.ch && found.xRel > 0))
- lineN = lineNo(lineObj = mergedPos.to.line)
- else
- return found
+ let collapsed = collapsedSpanAround(lineObj, found.ch + (found.xRel > 0 ? 1 : 0))
+ if (!collapsed) return found
+ let rangeEnd = collapsed.find(1)
+ if (rangeEnd.line == lineN) return rangeEnd
+ lineObj = getLine(doc, lineN = rangeEnd.line)
}
}
+function wrappedLineExtent(cm, lineObj, preparedMeasure, y) {
+ y -= widgetTopHeight(lineObj)
+ let end = lineObj.text.length
+ let begin = findFirst(ch => measureCharPrepared(cm, preparedMeasure, ch - 1).bottom <= y, end, 0)
+ end = findFirst(ch => measureCharPrepared(cm, preparedMeasure, ch).top > y, begin, end)
+ return {begin, end}
+}
+
+export function wrappedLineExtentChar(cm, lineObj, preparedMeasure, target) {
+ if (!preparedMeasure) preparedMeasure = prepareMeasureForLine(cm, lineObj)
+ let targetTop = intoCoordSystem(cm, lineObj, measureCharPrepared(cm, preparedMeasure, target), "line").top
+ return wrappedLineExtent(cm, lineObj, preparedMeasure, targetTop)
+}
+
+// Returns true if the given side of a box is after the given
+// coordinates, in top-to-bottom, left-to-right order.
+function boxIsAfter(box, x, y, left) {
+ return box.bottom <= y ? false : box.top > y ? true : (left ? box.left : box.right) > x
+}
+
function coordsCharInner(cm, lineObj, lineNo, x, y) {
- let innerOff = y - heightAtLine(lineObj)
- let wrongLine = false, adjust = 2 * cm.display.wrapper.clientWidth
+ // Move y into line-local coordinate space
+ y -= heightAtLine(lineObj)
let preparedMeasure = prepareMeasureForLine(cm, lineObj)
-
- function getX(ch) {
- let sp = cursorCoords(cm, Pos(lineNo, ch), "line", lineObj, preparedMeasure)
- wrongLine = true
- if (innerOff > sp.bottom) return sp.left - adjust
- else if (innerOff < sp.top) return sp.left + adjust
- else wrongLine = false
- return sp.left
+ // When directly calling `measureCharPrepared`, we have to adjust
+ // for the widgets at this line.
+ let widgetHeight = widgetTopHeight(lineObj)
+ let begin = 0, end = lineObj.text.length, ltr = true
+
+ let order = getOrder(lineObj, cm.doc.direction)
+ // If the line isn't plain left-to-right text, first figure out
+ // which bidi section the coordinates fall into.
+ if (order) {
+ let part = (cm.options.lineWrapping ? coordsBidiPartWrapped : coordsBidiPart)
+ (cm, lineObj, lineNo, preparedMeasure, order, x, y)
+ ltr = part.level != 1
+ // The awkward -1 offsets are needed because findFirst (called
+ // on these below) will treat its first bound as inclusive,
+ // second as exclusive, but we want to actually address the
+ // characters in the part's range
+ begin = ltr ? part.from : part.to - 1
+ end = ltr ? part.to : part.from - 1
}
- let bidi = getOrder(lineObj), dist = lineObj.text.length
- let from = lineLeft(lineObj), to = lineRight(lineObj)
- let fromX = getX(from), fromOutside = wrongLine, toX = getX(to), toOutside = wrongLine
-
- if (x > toX) return PosWithInfo(lineNo, to, toOutside, 1)
- // Do a binary search between these bounds.
- for (;;) {
- if (bidi ? to == from || to == moveVisually(lineObj, from, 1) : to - from <= 1) {
- let ch = x < fromX || x - fromX <= toX - x ? from : to
- let outside = ch == from ? fromOutside : toOutside
- let xDiff = x - (ch == from ? fromX : toX)
- // This is a kludge to handle the case where the coordinates
- // are after a line-wrapped line. We should replace it with a
- // more general handling of cursor positions around line
- // breaks. (Issue #4078)
- if (toOutside && !bidi && !/\s/.test(lineObj.text.charAt(ch)) && xDiff > 0 &&
- ch < lineObj.text.length && preparedMeasure.view.measure.heights.length > 1) {
- let charSize = measureCharPrepared(cm, preparedMeasure, ch, "right")
- if (innerOff <= charSize.bottom && innerOff >= charSize.top && Math.abs(x - charSize.right) < xDiff) {
- outside = false
- ch++
- xDiff = x - charSize.right
- }
- }
- while (isExtendingChar(lineObj.text.charAt(ch))) ++ch
- let pos = PosWithInfo(lineNo, ch, outside, xDiff < -1 ? -1 : xDiff > 1 ? 1 : 0)
- return pos
+ // A binary search to find the first character whose bounding box
+ // starts after the coordinates. If we run across any whose box wrap
+ // the coordinates, store that.
+ let chAround = null, boxAround = null
+ let ch = findFirst(ch => {
+ let box = measureCharPrepared(cm, preparedMeasure, ch)
+ box.top += widgetHeight; box.bottom += widgetHeight
+ if (!boxIsAfter(box, x, y, false)) return false
+ if (box.top <= y && box.left <= x) {
+ chAround = ch
+ boxAround = box
}
- let step = Math.ceil(dist / 2), middle = from + step
- if (bidi) {
- middle = from
- for (let i = 0; i < step; ++i) middle = moveVisually(lineObj, middle, 1)
+ return true
+ }, begin, end)
+
+ let baseX, sticky, outside = false
+ // If a box around the coordinates was found, use that
+ if (boxAround) {
+ // Distinguish coordinates nearer to the left or right side of the box
+ let atLeft = x - boxAround.left < boxAround.right - x, atStart = atLeft == ltr
+ ch = chAround + (atStart ? 0 : 1)
+ sticky = atStart ? "after" : "before"
+ baseX = atLeft ? boxAround.left : boxAround.right
+ } else {
+ // (Adjust for extended bound, if necessary.)
+ if (!ltr && (ch == end || ch == begin)) ch++
+ // To determine which side to associate with, get the box to the
+ // left of the character and compare it's vertical position to the
+ // coordinates
+ sticky = ch == 0 ? "after" : ch == lineObj.text.length ? "before" :
+ (measureCharPrepared(cm, preparedMeasure, ch - (ltr ? 1 : 0)).bottom + widgetHeight <= y) == ltr ?
+ "after" : "before"
+ // Now get accurate coordinates for this place, in order to get a
+ // base X position
+ let coords = cursorCoords(cm, Pos(lineNo, ch, sticky), "line", lineObj, preparedMeasure)
+ baseX = coords.left
+ outside = y < coords.top || y >= coords.bottom
+ }
+
+ ch = skipExtendingChars(lineObj.text, ch, 1)
+ return PosWithInfo(lineNo, ch, sticky, outside, x - baseX)
+}
+
+function coordsBidiPart(cm, lineObj, lineNo, preparedMeasure, order, x, y) {
+ // Bidi parts are sorted left-to-right, and in a non-line-wrapping
+ // situation, we can take this ordering to correspond to the visual
+ // ordering. This finds the first part whose end is after the given
+ // coordinates.
+ let index = findFirst(i => {
+ let part = order[i], ltr = part.level != 1
+ return boxIsAfter(cursorCoords(cm, Pos(lineNo, ltr ? part.to : part.from, ltr ? "before" : "after"),
+ "line", lineObj, preparedMeasure), x, y, true)
+ }, 0, order.length - 1)
+ let part = order[index]
+ // If this isn't the first part, the part's start is also after
+ // the coordinates, and the coordinates aren't on the same line as
+ // that start, move one part back.
+ if (index > 0) {
+ let ltr = part.level != 1
+ let start = cursorCoords(cm, Pos(lineNo, ltr ? part.from : part.to, ltr ? "after" : "before"),
+ "line", lineObj, preparedMeasure)
+ if (boxIsAfter(start, x, y, true) && start.top > y)
+ part = order[index - 1]
+ }
+ return part
+}
+
+function coordsBidiPartWrapped(cm, lineObj, _lineNo, preparedMeasure, order, x, y) {
+ // In a wrapped line, rtl text on wrapping boundaries can do things
+ // that don't correspond to the ordering in our `order` array at
+ // all, so a binary search doesn't work, and we want to return a
+ // part that only spans one line so that the binary search in
+ // coordsCharInner is safe. As such, we first find the extent of the
+ // wrapped line, and then do a flat search in which we discard any
+ // spans that aren't on the line.
+ let {begin, end} = wrappedLineExtent(cm, lineObj, preparedMeasure, y)
+ if (/\s/.test(lineObj.text.charAt(end - 1))) end--
+ let part = null, closestDist = null
+ for (let i = 0; i < order.length; i++) {
+ let p = order[i]
+ if (p.from >= end || p.to <= begin) continue
+ let ltr = p.level != 1
+ let endX = measureCharPrepared(cm, preparedMeasure, ltr ? Math.min(end, p.to) - 1 : Math.max(begin, p.from)).right
+ // Weigh against spans ending before this, so that they are only
+ // picked if nothing ends after
+ let dist = endX < x ? x - endX + 1e9 : endX - x
+ if (!part || closestDist > dist) {
+ part = p
+ closestDist = dist
}
- let middleX = getX(middle)
- if (middleX > x) {to = middle; toX = middleX; if (toOutside = wrongLine) toX += 1000; dist = step}
- else {from = middle; fromX = middleX; fromOutside = wrongLine; dist -= step}
}
+ if (!part) part = order[order.length - 1]
+ // Clip the part to the wrapped line.
+ if (part.from < begin) part = {from: begin, to: part.to, level: part.level}
+ if (part.to > end) part = {from: part.from, to: end, level: part.level}
+ return part
}
let measureText
diff --git a/js/codemirror-5.23.0/src/measurement/widgets.js b/js/codemirror-5.39.0/src/measurement/widgets.js
similarity index 95%
rename from js/codemirror-5.23.0/src/measurement/widgets.js
rename to js/codemirror-5.39.0/src/measurement/widgets.js
index 554cf80..39d7553 100644
--- a/js/codemirror-5.23.0/src/measurement/widgets.js
+++ b/js/codemirror-5.39.0/src/measurement/widgets.js
@@ -1,5 +1,5 @@
-import { contains, elt, removeChildrenAndAdd } from "../util/dom"
-import { e_target } from "../util/event"
+import { contains, elt, removeChildrenAndAdd } from "../util/dom.js"
+import { e_target } from "../util/event.js"
export function widgetHeight(widget) {
if (widget.height != null) return widget.height
diff --git a/js/codemirror-5.23.0/src/model/Doc.js b/js/codemirror-5.39.0/src/model/Doc.js
similarity index 90%
rename from js/codemirror-5.23.0/src/model/Doc.js
rename to js/codemirror-5.39.0/src/model/Doc.js
index 006598f..b64ac84 100644
--- a/js/codemirror-5.23.0/src/model/Doc.js
+++ b/js/codemirror-5.39.0/src/model/Doc.js
@@ -1,27 +1,27 @@
-import CodeMirror from "../edit/CodeMirror"
-import { docMethodOp } from "../display/operations"
-import { Line } from "../line/line_data"
-import { clipPos, clipPosArray, Pos } from "../line/pos"
-import { visualLine } from "../line/spans"
-import { getBetween, getLine, getLines, isLine, lineNo } from "../line/utils_line"
-import { classTest } from "../util/dom"
-import { splitLinesAuto } from "../util/feature_detection"
-import { createObj, map, isEmpty, sel_dontScroll } from "../util/misc"
-import { ensureCursorVisible } from "../display/scrolling"
-
-import { changeLine, makeChange, makeChangeFromHistory, replaceRange } from "./changes"
-import { computeReplacedSel } from "./change_measurement"
-import { BranchChunk, LeafChunk } from "./chunk"
-import { linkedDocs, updateDoc } from "./document_data"
-import { copyHistoryArray, History } from "./history"
-import { addLineWidget } from "./line_widget"
-import { copySharedMarkers, detachSharedMarkers, findSharedMarkers, markText } from "./mark_text"
-import { normalizeSelection, Range, simpleSelection } from "./selection"
-import { extendSelection, extendSelections, setSelection, setSelectionReplaceHistory, setSimpleSelection } from "./selection_updates"
+import CodeMirror from "../edit/CodeMirror.js"
+import { docMethodOp } from "../display/operations.js"
+import { Line } from "../line/line_data.js"
+import { clipPos, clipPosArray, Pos } from "../line/pos.js"
+import { visualLine } from "../line/spans.js"
+import { getBetween, getLine, getLines, isLine, lineNo } from "../line/utils_line.js"
+import { classTest } from "../util/dom.js"
+import { splitLinesAuto } from "../util/feature_detection.js"
+import { createObj, map, isEmpty, sel_dontScroll } from "../util/misc.js"
+import { ensureCursorVisible, scrollToCoords } from "../display/scrolling.js"
+
+import { changeLine, makeChange, makeChangeFromHistory, replaceRange } from "./changes.js"
+import { computeReplacedSel } from "./change_measurement.js"
+import { BranchChunk, LeafChunk } from "./chunk.js"
+import { directionChanged, linkedDocs, updateDoc } from "./document_data.js"
+import { copyHistoryArray, History } from "./history.js"
+import { addLineWidget } from "./line_widget.js"
+import { copySharedMarkers, detachSharedMarkers, findSharedMarkers, markText } from "./mark_text.js"
+import { normalizeSelection, Range, simpleSelection } from "./selection.js"
+import { extendSelection, extendSelections, setSelection, setSelectionReplaceHistory, setSimpleSelection } from "./selection_updates.js"
let nextDocId = 0
-let Doc = function(text, mode, firstLine, lineSep) {
- if (!(this instanceof Doc)) return new Doc(text, mode, firstLine, lineSep)
+let Doc = function(text, mode, firstLine, lineSep, direction) {
+ if (!(this instanceof Doc)) return new Doc(text, mode, firstLine, lineSep, direction)
if (firstLine == null) firstLine = 0
BranchChunk.call(this, [new LeafChunk([new Line("", null)])])
@@ -29,13 +29,14 @@ let Doc = function(text, mode, firstLine, lineSep) {
this.scrollTop = this.scrollLeft = 0
this.cantEdit = false
this.cleanGeneration = 1
- this.frontier = firstLine
+ this.modeFrontier = this.highlightFrontier = firstLine
let start = Pos(firstLine, 0)
this.sel = simpleSelection(start)
this.history = new History(null)
this.id = ++nextDocId
this.modeOption = mode
this.lineSep = lineSep
+ this.direction = (direction == "rtl") ? "rtl" : "ltr"
this.extend = false
if (typeof text == "string") text = this.splitLines(text)
@@ -74,7 +75,8 @@ Doc.prototype = createObj(BranchChunk.prototype, {
let top = Pos(this.first, 0), last = this.first + this.size - 1
makeChange(this, {from: top, to: Pos(last, getLine(this, last).text.length),
text: this.splitLines(code), origin: "setValue", full: true}, true)
- setSelection(this, simpleSelection(top))
+ if (this.cm) scrollToCoords(this.cm, 0, 0)
+ setSelection(this, simpleSelection(top), sel_dontScroll)
}),
replaceRange: function(code, from, to, origin) {
from = clipPos(this, from)
@@ -362,7 +364,7 @@ Doc.prototype = createObj(BranchChunk.prototype, {
copy: function(copyHistory) {
let doc = new Doc(getLines(this, this.first, this.first + this.size),
- this.modeOption, this.first, this.lineSep)
+ this.modeOption, this.first, this.lineSep, this.direction)
doc.scrollTop = this.scrollTop; doc.scrollLeft = this.scrollLeft
doc.sel = this.sel
doc.extend = false
@@ -378,7 +380,7 @@ Doc.prototype = createObj(BranchChunk.prototype, {
let from = this.first, to = this.first + this.size
if (options.from != null && options.from > from) from = options.from
if (options.to != null && options.to < to) to = options.to
- let copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from, this.lineSep)
+ let copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from, this.lineSep, this.direction)
if (options.sharedHist) copy.history = this.history
;(this.linked || (this.linked = [])).push({doc: copy, sharedHist: options.sharedHist})
copy.linked = [{doc: this, isParent: true, sharedHist: options.sharedHist}]
@@ -413,7 +415,15 @@ Doc.prototype = createObj(BranchChunk.prototype, {
if (this.lineSep) return str.split(this.lineSep)
return splitLinesAuto(str)
},
- lineSeparator: function() { return this.lineSep || "\n" }
+ lineSeparator: function() { return this.lineSep || "\n" },
+
+ setDirection: docMethodOp(function (dir) {
+ if (dir != "rtl") dir = "ltr"
+ if (dir == this.direction) return
+ this.direction = dir
+ this.iter(line => line.order = null)
+ if (this.cm) directionChanged(this.cm)
+ })
})
// Public alias.
diff --git a/js/codemirror-5.23.0/src/model/change_measurement.js b/js/codemirror-5.39.0/src/model/change_measurement.js
similarity index 96%
rename from js/codemirror-5.23.0/src/model/change_measurement.js
rename to js/codemirror-5.39.0/src/model/change_measurement.js
index 881f39e..4d45313 100644
--- a/js/codemirror-5.23.0/src/model/change_measurement.js
+++ b/js/codemirror-5.39.0/src/model/change_measurement.js
@@ -1,7 +1,7 @@
-import { cmp, Pos } from "../line/pos"
-import { lst } from "../util/misc"
+import { cmp, Pos } from "../line/pos.js"
+import { lst } from "../util/misc.js"
-import { normalizeSelection, Range, Selection } from "./selection"
+import { normalizeSelection, Range, Selection } from "./selection.js"
// Compute the position of the end of a change (its 'to' property
// refers to the pre-change end).
diff --git a/js/codemirror-5.23.0/src/model/changes.js b/js/codemirror-5.39.0/src/model/changes.js
similarity index 91%
rename from js/codemirror-5.23.0/src/model/changes.js
rename to js/codemirror-5.39.0/src/model/changes.js
index c6692d4..0d356f6 100644
--- a/js/codemirror-5.23.0/src/model/changes.js
+++ b/js/codemirror-5.39.0/src/model/changes.js
@@ -1,20 +1,21 @@
-import { startWorker } from "../display/highlight_worker"
-import { operation } from "../display/operations"
-import { regChange, regLineChange } from "../display/view_tracking"
-import { clipLine, clipPos, cmp, Pos } from "../line/pos"
-import { sawReadOnlySpans } from "../line/saw_special_spans"
-import { lineLength, removeReadOnlyRanges, stretchSpansOverChange, visualLine } from "../line/spans"
-import { getBetween, getLine, lineNo } from "../line/utils_line"
-import { estimateHeight } from "../measurement/position_measurement"
-import { hasHandler, signal, signalCursorActivity } from "../util/event"
-import { indexOf, lst, map, sel_dontScroll } from "../util/misc"
-import { signalLater } from "../util/operation_group"
-
-import { changeEnd, computeSelAfterChange } from "./change_measurement"
-import { isWholeLineUpdate, linkedDocs, updateDoc } from "./document_data"
-import { addChangeToHistory, historyChangeFromChange, mergeOldSpans, pushSelectionToHistory } from "./history"
-import { Range, Selection } from "./selection"
-import { setSelection, setSelectionNoUndo } from "./selection_updates"
+import { retreatFrontier } from "../line/highlight.js"
+import { startWorker } from "../display/highlight_worker.js"
+import { operation } from "../display/operations.js"
+import { regChange, regLineChange } from "../display/view_tracking.js"
+import { clipLine, clipPos, cmp, Pos } from "../line/pos.js"
+import { sawReadOnlySpans } from "../line/saw_special_spans.js"
+import { lineLength, removeReadOnlyRanges, stretchSpansOverChange, visualLine } from "../line/spans.js"
+import { getBetween, getLine, lineNo } from "../line/utils_line.js"
+import { estimateHeight } from "../measurement/position_measurement.js"
+import { hasHandler, signal, signalCursorActivity } from "../util/event.js"
+import { indexOf, lst, map, sel_dontScroll } from "../util/misc.js"
+import { signalLater } from "../util/operation_group.js"
+
+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"
// UPDATING
@@ -59,7 +60,7 @@ export function makeChange(doc, change, ignoreReadOnly) {
let split = sawReadOnlySpans && !ignoreReadOnly && removeReadOnlyRanges(doc, change.from, change.to)
if (split) {
for (let i = split.length - 1; i >= 0; --i)
- makeChangeInner(doc, {from: split[i].from, to: split[i].to, text: i ? [""] : change.text})
+ makeChangeInner(doc, {from: split[i].from, to: split[i].to, text: i ? [""] : change.text, origin: change.origin})
} else {
makeChangeInner(doc, change)
}
@@ -84,7 +85,8 @@ function makeChangeInner(doc, change) {
// Revert a change stored in a document's history.
export function makeChangeFromHistory(doc, type, allowSelectionOnly) {
- if (doc.cm && doc.cm.state.suppressEdits && !allowSelectionOnly) return
+ let suppress = doc.cm && doc.cm.state.suppressEdits
+ if (suppress && !allowSelectionOnly) return
let hist = doc.history, event, selAfter = doc.sel
let source = type == "undo" ? hist.done : hist.undone, dest = type == "undo" ? hist.undone : hist.done
@@ -109,8 +111,10 @@ export function makeChangeFromHistory(doc, type, allowSelectionOnly) {
return
}
selAfter = event
- }
- else break
+ } else if (suppress) {
+ source.push(event)
+ return
+ } else break
}
// Build up a reverse change object to add to the opposite history
@@ -231,8 +235,7 @@ function makeChangeSingleDocInEditor(cm, change, spans) {
if (recomputeMaxLength) cm.curOp.updateMaxLine = true
}
- // Adjust frontier, schedule worker
- doc.frontier = Math.min(doc.frontier, from.line)
+ retreatFrontier(doc, from.line)
startWorker(cm, 400)
let lendiff = change.text.length - (to.line - from.line) - 1
@@ -260,9 +263,9 @@ function makeChangeSingleDocInEditor(cm, change, spans) {
export function replaceRange(doc, code, from, to, origin) {
if (!to) to = from
- if (cmp(to, from) < 0) { let tmp = to; to = from; from = tmp }
+ if (cmp(to, from) < 0) [from, to] = [to, from]
if (typeof code == "string") code = doc.splitLines(code)
- makeChange(doc, {from: from, to: to, text: code, origin: origin})
+ makeChange(doc, {from, to, text: code, origin})
}
// Rebasing/resetting history to deal with externally-sourced changes
diff --git a/js/codemirror-5.23.0/src/model/chunk.js b/js/codemirror-5.39.0/src/model/chunk.js
similarity index 89%
rename from js/codemirror-5.23.0/src/model/chunk.js
rename to js/codemirror-5.39.0/src/model/chunk.js
index 2a05d7c..d82716d 100644
--- a/js/codemirror-5.23.0/src/model/chunk.js
+++ b/js/codemirror-5.39.0/src/model/chunk.js
@@ -1,6 +1,6 @@
-import { cleanUpLine } from "../line/line_data"
-import { indexOf } from "../util/misc"
-import { signalLater } from "../util/operation_group"
+import { cleanUpLine } from "../line/line_data.js"
+import { indexOf } from "../util/misc.js"
+import { signalLater } from "../util/operation_group.js"
// The document is represented as a BTree consisting of leaves, with
// chunk of lines in them, and branches, with up to ten leaves or
@@ -27,9 +27,10 @@ export function LeafChunk(lines) {
}
LeafChunk.prototype = {
- chunkSize: function() { return this.lines.length },
+ chunkSize() { return this.lines.length },
+
// Remove the n lines at offset 'at'.
- removeInner: function(at, n) {
+ removeInner(at, n) {
for (let i = at, e = at + n; i < e; ++i) {
let line = this.lines[i]
this.height -= line.height
@@ -38,19 +39,22 @@ LeafChunk.prototype = {
}
this.lines.splice(at, n)
},
+
// Helper used to collapse a small branch into a single leaf.
- collapse: function(lines) {
+ collapse(lines) {
lines.push.apply(lines, this.lines)
},
+
// Insert the given array of lines at offset 'at', count them as
// having the given height.
- insertInner: function(at, lines, height) {
+ insertInner(at, lines, height) {
this.height += height
this.lines = this.lines.slice(0, at).concat(lines).concat(this.lines.slice(at))
for (let i = 0; i < lines.length; ++i) lines[i].parent = this
},
+
// Used to iterate over a part of the tree.
- iterN: function(at, n, op) {
+ iterN(at, n, op) {
for (let e = at + n; at < e; ++at)
if (op(this.lines[at])) return true
}
@@ -70,8 +74,9 @@ export function BranchChunk(children) {
}
BranchChunk.prototype = {
- chunkSize: function() { return this.size },
- removeInner: function(at, n) {
+ chunkSize() { return this.size },
+
+ removeInner(at, n) {
this.size -= n
for (let i = 0; i < this.children.length; ++i) {
let child = this.children[i], sz = child.chunkSize()
@@ -94,10 +99,12 @@ BranchChunk.prototype = {
this.children[0].parent = this
}
},
- collapse: function(lines) {
+
+ collapse(lines) {
for (let i = 0; i < this.children.length; ++i) this.children[i].collapse(lines)
},
- insertInner: function(at, lines, height) {
+
+ insertInner(at, lines, height) {
this.size += lines.length
this.height += height
for (let i = 0; i < this.children.length; ++i) {
@@ -122,8 +129,9 @@ BranchChunk.prototype = {
at -= sz
}
},
+
// When a node has grown, check whether it should be split.
- maybeSpill: function() {
+ maybeSpill() {
if (this.children.length <= 10) return
let me = this
do {
@@ -144,7 +152,8 @@ BranchChunk.prototype = {
} while (me.children.length > 10)
me.parent.maybeSpill()
},
- iterN: function(at, n, op) {
+
+ iterN(at, n, op) {
for (let i = 0; i < this.children.length; ++i) {
let child = this.children[i], sz = child.chunkSize()
if (at < sz) {
diff --git a/js/codemirror-5.23.0/src/model/document_data.js b/js/codemirror-5.39.0/src/model/document_data.js
similarity index 82%
rename from js/codemirror-5.23.0/src/model/document_data.js
rename to js/codemirror-5.39.0/src/model/document_data.js
index 6ce2ae5..d946e7a 100644
--- a/js/codemirror-5.23.0/src/model/document_data.js
+++ b/js/codemirror-5.39.0/src/model/document_data.js
@@ -1,11 +1,13 @@
-import { loadMode } from "../display/mode_state"
-import { regChange } from "../display/view_tracking"
-import { Line, updateLine } from "../line/line_data"
-import { findMaxLine } from "../line/spans"
-import { getLine } from "../line/utils_line"
-import { estimateLineHeights } from "../measurement/position_measurement"
-import { lst } from "../util/misc"
-import { signalLater } from "../util/operation_group"
+import { loadMode } from "../display/mode_state.js"
+import { runInOp } from "../display/operations.js"
+import { regChange } from "../display/view_tracking.js"
+import { Line, updateLine } from "../line/line_data.js"
+import { findMaxLine } from "../line/spans.js"
+import { getLine } from "../line/utils_line.js"
+import { estimateLineHeights } from "../measurement/position_measurement.js"
+import { addClass, rmClass } from "../util/dom.js"
+import { lst } from "../util/misc.js"
+import { signalLater } from "../util/operation_group.js"
// DOCUMENT DATA STRUCTURE
@@ -91,8 +93,19 @@ export function attachDoc(cm, doc) {
doc.cm = cm
estimateLineHeights(cm)
loadMode(cm)
+ setDirectionClass(cm)
if (!cm.options.lineWrapping) findMaxLine(cm)
cm.options.mode = doc.modeOption
regChange(cm)
}
+function setDirectionClass(cm) {
+ ;(cm.doc.direction == "rtl" ? addClass : rmClass)(cm.display.lineDiv, "CodeMirror-rtl")
+}
+
+export function directionChanged(cm) {
+ runInOp(cm, () => {
+ setDirectionClass(cm)
+ regChange(cm)
+ })
+}
diff --git a/js/codemirror-5.23.0/src/model/history.js b/js/codemirror-5.39.0/src/model/history.js
similarity index 93%
rename from js/codemirror-5.23.0/src/model/history.js
rename to js/codemirror-5.39.0/src/model/history.js
index 83938cf..2d9359f 100644
--- a/js/codemirror-5.23.0/src/model/history.js
+++ b/js/codemirror-5.39.0/src/model/history.js
@@ -1,12 +1,12 @@
-import { cmp, copyPos } from "../line/pos"
-import { stretchSpansOverChange } from "../line/spans"
-import { getBetween } from "../line/utils_line"
-import { signal } from "../util/event"
-import { indexOf, lst } from "../util/misc"
+import { cmp, copyPos } from "../line/pos.js"
+import { stretchSpansOverChange } from "../line/spans.js"
+import { getBetween } from "../line/utils_line.js"
+import { signal } from "../util/event.js"
+import { indexOf, lst } from "../util/misc.js"
-import { changeEnd } from "./change_measurement"
-import { linkedDocs } from "./document_data"
-import { Selection } from "./selection"
+import { changeEnd } from "./change_measurement.js"
+import { linkedDocs } from "./document_data.js"
+import { Selection } from "./selection.js"
export function History(startGen) {
// Arrays of change events and selections. Doing something adds an
@@ -67,7 +67,7 @@ export function addChangeToHistory(doc, change, selAfter, opId) {
if ((hist.lastOp == opId ||
hist.lastOrigin == change.origin && change.origin &&
- ((change.origin.charAt(0) == "+" && doc.cm && hist.lastModTime > time - doc.cm.options.historyEventDelay) ||
+ ((change.origin.charAt(0) == "+" && hist.lastModTime > time - (doc.cm ? doc.cm.options.historyEventDelay : 500)) ||
change.origin.charAt(0) == "*")) &&
(cur = lastChangeEvent(hist, hist.lastOp == opId))) {
// Merge this change into the last event
diff --git a/js/codemirror-5.39.0/src/model/line_widget.js b/js/codemirror-5.39.0/src/model/line_widget.js
new file mode 100644
index 0000000..6308076
--- /dev/null
+++ b/js/codemirror-5.39.0/src/model/line_widget.js
@@ -0,0 +1,78 @@
+import { runInOp } from "../display/operations.js"
+import { addToScrollTop } from "../display/scrolling.js"
+import { regLineChange } from "../display/view_tracking.js"
+import { heightAtLine, lineIsHidden } from "../line/spans.js"
+import { lineNo, updateLineHeight } from "../line/utils_line.js"
+import { widgetHeight } from "../measurement/widgets.js"
+import { changeLine } from "./changes.js"
+import { eventMixin } from "../util/event.js"
+import { signalLater } from "../util/operation_group.js"
+
+// Line widgets are block elements displayed above or below a line.
+
+export class LineWidget {
+ constructor(doc, node, options) {
+ if (options) for (let opt in options) if (options.hasOwnProperty(opt))
+ this[opt] = options[opt]
+ this.doc = doc
+ this.node = node
+ }
+
+ clear() {
+ let cm = this.doc.cm, ws = this.line.widgets, line = this.line, no = lineNo(line)
+ if (no == null || !ws) return
+ for (let i = 0; i < ws.length; ++i) if (ws[i] == this) ws.splice(i--, 1)
+ if (!ws.length) line.widgets = null
+ let height = widgetHeight(this)
+ updateLineHeight(line, Math.max(0, line.height - height))
+ if (cm) {
+ runInOp(cm, () => {
+ adjustScrollWhenAboveVisible(cm, line, -height)
+ regLineChange(cm, no, "widget")
+ })
+ signalLater(cm, "lineWidgetCleared", cm, this, no)
+ }
+ }
+
+ changed() {
+ let oldH = this.height, cm = this.doc.cm, line = this.line
+ this.height = null
+ let diff = widgetHeight(this) - oldH
+ if (!diff) return
+ updateLineHeight(line, line.height + diff)
+ if (cm) {
+ runInOp(cm, () => {
+ cm.curOp.forceUpdate = true
+ adjustScrollWhenAboveVisible(cm, line, diff)
+ signalLater(cm, "lineWidgetChanged", cm, this, lineNo(line))
+ })
+ }
+ }
+}
+eventMixin(LineWidget)
+
+function adjustScrollWhenAboveVisible(cm, line, diff) {
+ if (heightAtLine(line) < ((cm.curOp && cm.curOp.scrollTop) || cm.doc.scrollTop))
+ addToScrollTop(cm, diff)
+}
+
+export function addLineWidget(doc, handle, node, options) {
+ let widget = new LineWidget(doc, node, options)
+ let cm = doc.cm
+ if (cm && widget.noHScroll) cm.display.alignWidgets = true
+ changeLine(doc, handle, "widget", line => {
+ let widgets = line.widgets || (line.widgets = [])
+ if (widget.insertAt == null) widgets.push(widget)
+ else widgets.splice(Math.min(widgets.length - 1, Math.max(0, widget.insertAt)), 0, widget)
+ widget.line = line
+ if (cm && !lineIsHidden(doc, line)) {
+ let aboveVisible = heightAtLine(line) < doc.scrollTop
+ updateLineHeight(line, line.height + widgetHeight(widget))
+ if (aboveVisible) addToScrollTop(cm, widget.height)
+ cm.curOp.forceUpdate = true
+ }
+ return true
+ })
+ if (cm) signalLater(cm, "lineWidgetAdded", cm, widget, typeof handle == "number" ? handle : lineNo(handle))
+ return widget
+}
diff --git a/js/codemirror-5.23.0/src/model/mark_text.js b/js/codemirror-5.39.0/src/model/mark_text.js
similarity index 53%
rename from js/codemirror-5.23.0/src/model/mark_text.js
rename to js/codemirror-5.39.0/src/model/mark_text.js
index 15ec284..955c72c 100644
--- a/js/codemirror-5.23.0/src/model/mark_text.js
+++ b/js/codemirror-5.39.0/src/model/mark_text.js
@@ -1,19 +1,19 @@
-import { elt } from "../util/dom"
-import { eventMixin, hasHandler, on } from "../util/event"
-import { endOperation, operation, runInOp, startOperation } from "../display/operations"
-import { clipPos, cmp, Pos } from "../line/pos"
-import { lineNo, updateLineHeight } from "../line/utils_line"
-import { clearLineMeasurementCacheFor, findViewForLine, textHeight } from "../measurement/position_measurement"
-import { seeReadOnlySpans, seeCollapsedSpans } from "../line/saw_special_spans"
-import { addMarkedSpan, conflictingCollapsedRange, getMarkedSpanFor, lineIsHidden, lineLength, MarkedSpan, removeMarkedSpan, visualLine } from "../line/spans"
-import { copyObj, indexOf, lst } from "../util/misc"
-import { signalLater } from "../util/operation_group"
-import { widgetHeight } from "../measurement/widgets"
-import { regChange, regLineChange } from "../display/view_tracking"
+import { eltP } from "../util/dom.js"
+import { eventMixin, hasHandler, on } from "../util/event.js"
+import { endOperation, operation, runInOp, startOperation } from "../display/operations.js"
+import { clipPos, cmp, Pos } from "../line/pos.js"
+import { lineNo, updateLineHeight } from "../line/utils_line.js"
+import { clearLineMeasurementCacheFor, findViewForLine, textHeight } from "../measurement/position_measurement.js"
+import { seeReadOnlySpans, seeCollapsedSpans } from "../line/saw_special_spans.js"
+import { addMarkedSpan, conflictingCollapsedRange, getMarkedSpanFor, lineIsHidden, lineLength, MarkedSpan, removeMarkedSpan, visualLine } from "../line/spans.js"
+import { copyObj, indexOf, lst } from "../util/misc.js"
+import { signalLater } from "../util/operation_group.js"
+import { widgetHeight } from "../measurement/widgets.js"
+import { regChange, regLineChange } from "../display/view_tracking.js"
-import { linkedDocs } from "./document_data"
-import { addChangeToHistory } from "./history"
-import { reCheckSelection } from "./selection_updates"
+import { linkedDocs } from "./document_data.js"
+import { addChangeToHistory } from "./history.js"
+import { reCheckSelection } from "./selection_updates.js"
// TEXTMARKERS
@@ -32,118 +32,122 @@ import { reCheckSelection } from "./selection_updates"
// when they overlap (they may nest, but not partially overlap).
let nextMarkerId = 0
-export function TextMarker(doc, type) {
- this.lines = []
- this.type = type
- this.doc = doc
- this.id = ++nextMarkerId
-}
-eventMixin(TextMarker)
-
-// Clear the marker.
-TextMarker.prototype.clear = function() {
- if (this.explicitlyCleared) return
- let cm = this.doc.cm, withOp = cm && !cm.curOp
- if (withOp) startOperation(cm)
- if (hasHandler(this, "clear")) {
- let found = this.find()
- if (found) signalLater(this, "clear", found.from, found.to)
+export class TextMarker {
+ constructor(doc, type) {
+ this.lines = []
+ this.type = type
+ this.doc = doc
+ this.id = ++nextMarkerId
}
- let min = null, max = null
- for (let i = 0; i < this.lines.length; ++i) {
- let line = this.lines[i]
- let span = getMarkedSpanFor(line.markedSpans, this)
- if (cm && !this.collapsed) regLineChange(cm, lineNo(line), "text")
- else if (cm) {
- if (span.to != null) max = lineNo(line)
- if (span.from != null) min = lineNo(line)
+
+ // Clear the marker.
+ clear() {
+ if (this.explicitlyCleared) return
+ let cm = this.doc.cm, withOp = cm && !cm.curOp
+ if (withOp) startOperation(cm)
+ if (hasHandler(this, "clear")) {
+ let found = this.find()
+ if (found) signalLater(this, "clear", found.from, found.to)
}
- line.markedSpans = removeMarkedSpan(line.markedSpans, span)
- if (span.from == null && this.collapsed && !lineIsHidden(this.doc, line) && cm)
- updateLineHeight(line, textHeight(cm.display))
+ let min = null, max = null
+ for (let i = 0; i < this.lines.length; ++i) {
+ let line = this.lines[i]
+ let span = getMarkedSpanFor(line.markedSpans, this)
+ if (cm && !this.collapsed) regLineChange(cm, lineNo(line), "text")
+ else if (cm) {
+ if (span.to != null) max = lineNo(line)
+ if (span.from != null) min = lineNo(line)
+ }
+ line.markedSpans = removeMarkedSpan(line.markedSpans, span)
+ if (span.from == null && this.collapsed && !lineIsHidden(this.doc, line) && cm)
+ updateLineHeight(line, textHeight(cm.display))
+ }
+ if (cm && this.collapsed && !cm.options.lineWrapping) for (let i = 0; i < this.lines.length; ++i) {
+ let visual = visualLine(this.lines[i]), len = lineLength(visual)
+ if (len > cm.display.maxLineLength) {
+ cm.display.maxLine = visual
+ cm.display.maxLineLength = len
+ cm.display.maxLineChanged = true
+ }
+ }
+
+ if (min != null && cm && this.collapsed) regChange(cm, min, max + 1)
+ this.lines.length = 0
+ this.explicitlyCleared = true
+ if (this.atomic && this.doc.cantEdit) {
+ this.doc.cantEdit = false
+ if (cm) reCheckSelection(cm.doc)
+ }
+ if (cm) signalLater(cm, "markerCleared", cm, this, min, max)
+ if (withOp) endOperation(cm)
+ if (this.parent) this.parent.clear()
}
- if (cm && this.collapsed && !cm.options.lineWrapping) for (let i = 0; i < this.lines.length; ++i) {
- let visual = visualLine(this.lines[i]), len = lineLength(visual)
- if (len > cm.display.maxLineLength) {
- cm.display.maxLine = visual
- cm.display.maxLineLength = len
- cm.display.maxLineChanged = true
+
+ // Find the position of the marker in the document. Returns a {from,
+ // to} object by default. Side can be passed to get a specific side
+ // -- 0 (both), -1 (left), or 1 (right). When lineObj is true, the
+ // Pos objects returned contain a line object, rather than a line
+ // number (used to prevent looking up the same line twice).
+ find(side, lineObj) {
+ if (side == null && this.type == "bookmark") side = 1
+ let from, to
+ for (let i = 0; i < this.lines.length; ++i) {
+ let line = this.lines[i]
+ let span = getMarkedSpanFor(line.markedSpans, this)
+ if (span.from != null) {
+ from = Pos(lineObj ? line : lineNo(line), span.from)
+ if (side == -1) return from
+ }
+ if (span.to != null) {
+ to = Pos(lineObj ? line : lineNo(line), span.to)
+ if (side == 1) return to
+ }
}
+ return from && {from: from, to: to}
}
- if (min != null && cm && this.collapsed) regChange(cm, min, max + 1)
- this.lines.length = 0
- this.explicitlyCleared = true
- if (this.atomic && this.doc.cantEdit) {
- this.doc.cantEdit = false
- if (cm) reCheckSelection(cm.doc)
+ // Signals that the marker's widget changed, and surrounding layout
+ // should be recomputed.
+ changed() {
+ let pos = this.find(-1, true), widget = this, cm = this.doc.cm
+ if (!pos || !cm) return
+ runInOp(cm, () => {
+ let line = pos.line, lineN = lineNo(pos.line)
+ let view = findViewForLine(cm, lineN)
+ if (view) {
+ clearLineMeasurementCacheFor(view)
+ cm.curOp.selectionChanged = cm.curOp.forceUpdate = true
+ }
+ cm.curOp.updateMaxLine = true
+ if (!lineIsHidden(widget.doc, line) && widget.height != null) {
+ let oldHeight = widget.height
+ widget.height = null
+ let dHeight = widgetHeight(widget) - oldHeight
+ if (dHeight)
+ updateLineHeight(line, line.height + dHeight)
+ }
+ signalLater(cm, "markerChanged", cm, this)
+ })
}
- if (cm) signalLater(cm, "markerCleared", cm, this)
- if (withOp) endOperation(cm)
- if (this.parent) this.parent.clear()
-}
-// Find the position of the marker in the document. Returns a {from,
-// to} object by default. Side can be passed to get a specific side
-// -- 0 (both), -1 (left), or 1 (right). When lineObj is true, the
-// Pos objects returned contain a line object, rather than a line
-// number (used to prevent looking up the same line twice).
-TextMarker.prototype.find = function(side, lineObj) {
- if (side == null && this.type == "bookmark") side = 1
- let from, to
- for (let i = 0; i < this.lines.length; ++i) {
- let line = this.lines[i]
- let span = getMarkedSpanFor(line.markedSpans, this)
- if (span.from != null) {
- from = Pos(lineObj ? line : lineNo(line), span.from)
- if (side == -1) return from
- }
- if (span.to != null) {
- to = Pos(lineObj ? line : lineNo(line), span.to)
- if (side == 1) return to
+ attachLine(line) {
+ if (!this.lines.length && this.doc.cm) {
+ let op = this.doc.cm.curOp
+ if (!op.maybeHiddenMarkers || indexOf(op.maybeHiddenMarkers, this) == -1)
+ (op.maybeUnhiddenMarkers || (op.maybeUnhiddenMarkers = [])).push(this)
}
+ this.lines.push(line)
}
- return from && {from: from, to: to}
-}
-// Signals that the marker's widget changed, and surrounding layout
-// should be recomputed.
-TextMarker.prototype.changed = function() {
- let pos = this.find(-1, true), widget = this, cm = this.doc.cm
- if (!pos || !cm) return
- runInOp(cm, () => {
- let line = pos.line, lineN = lineNo(pos.line)
- let view = findViewForLine(cm, lineN)
- if (view) {
- clearLineMeasurementCacheFor(view)
- cm.curOp.selectionChanged = cm.curOp.forceUpdate = true
- }
- cm.curOp.updateMaxLine = true
- if (!lineIsHidden(widget.doc, line) && widget.height != null) {
- let oldHeight = widget.height
- widget.height = null
- let dHeight = widgetHeight(widget) - oldHeight
- if (dHeight)
- updateLineHeight(line, line.height + dHeight)
+ detachLine(line) {
+ this.lines.splice(indexOf(this.lines, line), 1)
+ if (!this.lines.length && this.doc.cm) {
+ let op = this.doc.cm.curOp
+ ;(op.maybeHiddenMarkers || (op.maybeHiddenMarkers = [])).push(this)
}
- })
-}
-
-TextMarker.prototype.attachLine = function(line) {
- if (!this.lines.length && this.doc.cm) {
- let op = this.doc.cm.curOp
- if (!op.maybeHiddenMarkers || indexOf(op.maybeHiddenMarkers, this) == -1)
- (op.maybeUnhiddenMarkers || (op.maybeUnhiddenMarkers = [])).push(this)
- }
- this.lines.push(line)
-}
-TextMarker.prototype.detachLine = function(line) {
- this.lines.splice(indexOf(this.lines, line), 1)
- if (!this.lines.length && this.doc.cm) {
- let op = this.doc.cm.curOp
- ;(op.maybeHiddenMarkers || (op.maybeHiddenMarkers = [])).push(this)
}
}
+eventMixin(TextMarker)
// Create a marker, wire it up to the right lines, and
export function markText(doc, from, to, options, type) {
@@ -162,8 +166,7 @@ export function markText(doc, from, to, options, type) {
if (marker.replacedWith) {
// Showing up as a widget implies collapsed (widget replaces text)
marker.collapsed = true
- marker.widgetNode = elt("span", [marker.replacedWith], "CodeMirror-widget")
- marker.widgetNode.setAttribute("role", "presentation") // hide from accessibility tree
+ marker.widgetNode = eltP("span", [marker.replacedWith], "CodeMirror-widget")
if (!options.handleMouseEvents) marker.widgetNode.setAttribute("cm-ignore-events", "true")
if (options.insertLeft) marker.widgetNode.insertLeft = true
}
@@ -221,24 +224,27 @@ export function markText(doc, from, to, options, type) {
// A shared marker spans multiple linked documents. It is
// implemented as a meta-marker-object controlling multiple normal
// markers.
-export function SharedTextMarker(markers, primary) {
- this.markers = markers
- this.primary = primary
- for (let i = 0; i < markers.length; ++i)
- markers[i].parent = this
-}
-eventMixin(SharedTextMarker)
+export class SharedTextMarker {
+ constructor(markers, primary) {
+ this.markers = markers
+ this.primary = primary
+ for (let i = 0; i < markers.length; ++i)
+ markers[i].parent = this
+ }
-SharedTextMarker.prototype.clear = function() {
- if (this.explicitlyCleared) return
- this.explicitlyCleared = true
- for (let i = 0; i < this.markers.length; ++i)
- this.markers[i].clear()
- signalLater(this, "clear")
-}
-SharedTextMarker.prototype.find = function(side, lineObj) {
- return this.primary.find(side, lineObj)
+ clear() {
+ if (this.explicitlyCleared) return
+ this.explicitlyCleared = true
+ for (let i = 0; i < this.markers.length; ++i)
+ this.markers[i].clear()
+ signalLater(this, "clear")
+ }
+
+ find(side, lineObj) {
+ return this.primary.find(side, lineObj)
+ }
}
+eventMixin(SharedTextMarker)
function markTextShared(doc, from, to, options, type) {
options = copyObj(options)
diff --git a/js/codemirror-5.23.0/src/model/selection.js b/js/codemirror-5.39.0/src/model/selection.js
similarity index 70%
rename from js/codemirror-5.23.0/src/model/selection.js
rename to js/codemirror-5.39.0/src/model/selection.js
index 120af2a..2e374aa 100644
--- a/js/codemirror-5.23.0/src/model/selection.js
+++ b/js/codemirror-5.39.0/src/model/selection.js
@@ -1,39 +1,43 @@
-import { cmp, copyPos, maxPos, minPos } from "../line/pos"
-import { indexOf } from "../util/misc"
+import { cmp, copyPos, equalCursorPos, maxPos, minPos } from "../line/pos.js"
+import { indexOf } from "../util/misc.js"
// Selection objects are immutable. A new one is created every time
// the selection changes. A selection is one or more non-overlapping
// (and non-touching) ranges, sorted, and an integer that indicates
// which one is the primary selection (the one that's scrolled into
// view, that getCursor returns, etc).
-export function Selection(ranges, primIndex) {
- this.ranges = ranges
- this.primIndex = primIndex
-}
+export class Selection {
+ constructor(ranges, primIndex) {
+ this.ranges = ranges
+ this.primIndex = primIndex
+ }
+
+ primary() { return this.ranges[this.primIndex] }
-Selection.prototype = {
- primary: function() { return this.ranges[this.primIndex] },
- equals: function(other) {
+ equals(other) {
if (other == this) return true
if (other.primIndex != this.primIndex || other.ranges.length != this.ranges.length) return false
for (let i = 0; i < this.ranges.length; i++) {
let here = this.ranges[i], there = other.ranges[i]
- if (cmp(here.anchor, there.anchor) != 0 || cmp(here.head, there.head) != 0) return false
+ if (!equalCursorPos(here.anchor, there.anchor) || !equalCursorPos(here.head, there.head)) return false
}
return true
- },
- deepCopy: function() {
+ }
+
+ deepCopy() {
let out = []
for (let i = 0; i < this.ranges.length; i++)
out[i] = new Range(copyPos(this.ranges[i].anchor), copyPos(this.ranges[i].head))
return new Selection(out, this.primIndex)
- },
- somethingSelected: function() {
+ }
+
+ somethingSelected() {
for (let i = 0; i < this.ranges.length; i++)
if (!this.ranges[i].empty()) return true
return false
- },
- contains: function(pos, end) {
+ }
+
+ contains(pos, end) {
if (!end) end = pos
for (let i = 0; i < this.ranges.length; i++) {
let range = this.ranges[i]
@@ -44,16 +48,14 @@ Selection.prototype = {
}
}
-export function Range(anchor, head) {
- this.anchor = anchor; this.head = head
-}
-
-Range.prototype = {
- from: function() { return minPos(this.anchor, this.head) },
- to: function() { return maxPos(this.anchor, this.head) },
- empty: function() {
- return this.head.line == this.anchor.line && this.head.ch == this.anchor.ch
+export class Range {
+ constructor(anchor, head) {
+ this.anchor = anchor; this.head = head
}
+
+ from() { return minPos(this.anchor, this.head) }
+ to() { return maxPos(this.anchor, this.head) }
+ empty() { return this.head.line == this.anchor.line && this.head.ch == this.anchor.ch }
}
// Take an unsorted, potentially overlapping set of ranges, and
diff --git a/js/codemirror-5.23.0/src/model/selection_updates.js b/js/codemirror-5.39.0/src/model/selection_updates.js
similarity index 89%
rename from js/codemirror-5.23.0/src/model/selection_updates.js
rename to js/codemirror-5.39.0/src/model/selection_updates.js
index 0e310a5..77986a9 100644
--- a/js/codemirror-5.23.0/src/model/selection_updates.js
+++ b/js/codemirror-5.39.0/src/model/selection_updates.js
@@ -1,12 +1,12 @@
-import { signalLater } from "../util/operation_group"
-import { ensureCursorVisible } from "../display/scrolling"
-import { clipPos, cmp, Pos } from "../line/pos"
-import { getLine } from "../line/utils_line"
-import { hasHandler, signal, signalCursorActivity } from "../util/event"
-import { lst, sel_dontScroll } from "../util/misc"
+import { signalLater } from "../util/operation_group.js"
+import { ensureCursorVisible } from "../display/scrolling.js"
+import { clipPos, cmp, Pos } from "../line/pos.js"
+import { getLine } from "../line/utils_line.js"
+import { hasHandler, signal, signalCursorActivity } from "../util/event.js"
+import { lst, sel_dontScroll } from "../util/misc.js"
-import { addSelectionToHistory } from "./history"
-import { normalizeSelection, Range, Selection, simpleSelection } from "./selection"
+import { addSelectionToHistory } from "./history.js"
+import { normalizeSelection, Range, Selection, simpleSelection } from "./selection.js"
// The 'scroll' parameter given to many of these indicated whether
// the new cursor position should be scrolled into view after
@@ -16,8 +16,8 @@ import { normalizeSelection, Range, Selection, simpleSelection } from "./selecti
// include a given position (and optionally a second position).
// Otherwise, simply returns the range between the given positions.
// Used for cursor motion and such.
-export function extendRange(doc, range, head, other) {
- if (doc.cm && doc.cm.display.shift || doc.extend) {
+export function extendRange(range, head, other, extend) {
+ if (extend) {
let anchor = range.anchor
if (other) {
let posBefore = cmp(head, anchor) < 0
@@ -35,16 +35,18 @@ export function extendRange(doc, range, head, other) {
}
// Extend the primary selection range, discard the rest.
-export function extendSelection(doc, head, other, options) {
- setSelection(doc, new Selection([extendRange(doc, doc.sel.primary(), head, other)], 0), options)
+export function extendSelection(doc, head, other, options, extend) {
+ if (extend == null) extend = doc.cm && (doc.cm.display.shift || doc.extend)
+ setSelection(doc, new Selection([extendRange(doc.sel.primary(), head, other, extend)], 0), options)
}
// Extend all selections (pos is an array of selections with length
// equal the number of selections)
export function extendSelections(doc, heads, options) {
let out = []
+ let extend = doc.cm && (doc.cm.display.shift || doc.extend)
for (let i = 0; i < doc.sel.ranges.length; i++)
- out[i] = extendRange(doc, doc.sel.ranges[i], heads[i], null)
+ out[i] = extendRange(doc.sel.ranges[i], heads[i], null, extend)
let newSel = normalizeSelection(out, doc.sel.primIndex)
setSelection(doc, newSel, options)
}
@@ -123,7 +125,7 @@ function setSelectionInner(doc, sel) {
// Verify that the selection does not partially select any atomic
// marked ranges.
export function reCheckSelection(doc) {
- setSelectionInner(doc, skipAtomicInSelection(doc, doc.sel, null, false), sel_dontScroll)
+ setSelectionInner(doc, skipAtomicInSelection(doc, doc.sel, null, false))
}
// Return a selection that does not partially select any atomic
diff --git a/js/codemirror-5.23.0/src/modes.js b/js/codemirror-5.39.0/src/modes.js
similarity index 98%
rename from js/codemirror-5.23.0/src/modes.js
rename to js/codemirror-5.39.0/src/modes.js
index 065a463..8384517 100644
--- a/js/codemirror-5.23.0/src/modes.js
+++ b/js/codemirror-5.39.0/src/modes.js
@@ -1,4 +1,4 @@
-import { copyObj, createObj } from "./util/misc"
+import { copyObj, createObj } from "./util/misc.js"
// Known modes, by name and by MIME
export let modes = {}, mimeModes = {}
diff --git a/js/codemirror-5.23.0/src/util/StringStream.js b/js/codemirror-5.39.0/src/util/StringStream.js
similarity index 64%
rename from js/codemirror-5.23.0/src/util/StringStream.js
rename to js/codemirror-5.39.0/src/util/StringStream.js
index 92dbc69..022c4bc 100644
--- a/js/codemirror-5.23.0/src/util/StringStream.js
+++ b/js/codemirror-5.39.0/src/util/StringStream.js
@@ -1,61 +1,62 @@
-import { countColumn } from "./misc"
+import { countColumn } from "./misc.js"
// STRING STREAM
// Fed to the mode parsers, provides helper functions to make
// parsers more succinct.
-let StringStream = function(string, tabSize) {
- this.pos = this.start = 0
- this.string = string
- this.tabSize = tabSize || 8
- this.lastColumnPos = this.lastColumnValue = 0
- this.lineStart = 0
-}
+class StringStream {
+ constructor(string, tabSize, lineOracle) {
+ this.pos = this.start = 0
+ this.string = string
+ this.tabSize = tabSize || 8
+ this.lastColumnPos = this.lastColumnValue = 0
+ this.lineStart = 0
+ this.lineOracle = lineOracle
+ }
-StringStream.prototype = {
- eol: function() {return this.pos >= this.string.length},
- sol: function() {return this.pos == this.lineStart},
- peek: function() {return this.string.charAt(this.pos) || undefined},
- next: function() {
+ eol() {return this.pos >= this.string.length}
+ sol() {return this.pos == this.lineStart}
+ peek() {return this.string.charAt(this.pos) || undefined}
+ next() {
if (this.pos < this.string.length)
return this.string.charAt(this.pos++)
- },
- eat: function(match) {
+ }
+ eat(match) {
let ch = this.string.charAt(this.pos)
let ok
if (typeof match == "string") ok = ch == match
else ok = ch && (match.test ? match.test(ch) : match(ch))
if (ok) {++this.pos; return ch}
- },
- eatWhile: function(match) {
+ }
+ eatWhile(match) {
let start = this.pos
while (this.eat(match)){}
return this.pos > start
- },
- eatSpace: function() {
+ }
+ eatSpace() {
let start = this.pos
while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) ++this.pos
return this.pos > start
- },
- skipToEnd: function() {this.pos = this.string.length},
- skipTo: function(ch) {
+ }
+ skipToEnd() {this.pos = this.string.length}
+ skipTo(ch) {
let found = this.string.indexOf(ch, this.pos)
if (found > -1) {this.pos = found; return true}
- },
- backUp: function(n) {this.pos -= n},
- column: function() {
+ }
+ backUp(n) {this.pos -= n}
+ column() {
if (this.lastColumnPos < this.start) {
this.lastColumnValue = countColumn(this.string, this.start, this.tabSize, this.lastColumnPos, this.lastColumnValue)
this.lastColumnPos = this.start
}
return this.lastColumnValue - (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0)
- },
- indentation: function() {
+ }
+ indentation() {
return countColumn(this.string, null, this.tabSize) -
(this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0)
- },
- match: function(pattern, consume, caseInsensitive) {
+ }
+ match(pattern, consume, caseInsensitive) {
if (typeof pattern == "string") {
let cased = str => caseInsensitive ? str.toLowerCase() : str
let substr = this.string.substr(this.pos, pattern.length)
@@ -69,13 +70,21 @@ StringStream.prototype = {
if (match && consume !== false) this.pos += match[0].length
return match
}
- },
- current: function(){return this.string.slice(this.start, this.pos)},
- hideFirstChars: function(n, inner) {
+ }
+ current(){return this.string.slice(this.start, this.pos)}
+ hideFirstChars(n, inner) {
this.lineStart += n
try { return inner() }
finally { this.lineStart -= n }
}
+ lookAhead(n) {
+ let oracle = this.lineOracle
+ return oracle && oracle.lookAhead(n)
+ }
+ baseToken() {
+ let oracle = this.lineOracle
+ return oracle && oracle.baseToken(this.pos)
+ }
}
export default StringStream
diff --git a/js/codemirror-5.23.0/src/util/bidi.js b/js/codemirror-5.39.0/src/util/bidi.js
similarity index 67%
rename from js/codemirror-5.23.0/src/util/bidi.js
rename to js/codemirror-5.39.0/src/util/bidi.js
index 6a84914..33ab854 100644
--- a/js/codemirror-5.23.0/src/util/bidi.js
+++ b/js/codemirror-5.39.0/src/util/bidi.js
@@ -1,98 +1,37 @@
-import { isExtendingChar, lst } from "./misc"
+import { lst } from "./misc.js"
// BIDI HELPERS
export function iterateBidiSections(order, from, to, f) {
- if (!order) return f(from, to, "ltr")
+ if (!order) return f(from, to, "ltr", 0)
let found = false
for (let i = 0; i < order.length; ++i) {
let part = order[i]
if (part.from < to && part.to > from || from == to && part.to == from) {
- f(Math.max(part.from, from), Math.min(part.to, to), part.level == 1 ? "rtl" : "ltr")
+ f(Math.max(part.from, from), Math.min(part.to, to), part.level == 1 ? "rtl" : "ltr", i)
found = true
}
}
if (!found) f(from, to, "ltr")
}
-export function bidiLeft(part) { return part.level % 2 ? part.to : part.from }
-export function bidiRight(part) { return part.level % 2 ? part.from : part.to }
-
-export function lineLeft(line) { let order = getOrder(line); return order ? bidiLeft(order[0]) : 0 }
-export function lineRight(line) {
- let order = getOrder(line)
- if (!order) return line.text.length
- return bidiRight(lst(order))
-}
-
-function compareBidiLevel(order, a, b) {
- let linedir = order[0].level
- if (a == linedir) return true
- if (b == linedir) return false
- return a < b
-}
-
export let bidiOther = null
-export function getBidiPartAt(order, pos) {
+export function getBidiPartAt(order, ch, sticky) {
let found
bidiOther = null
for (let i = 0; i < order.length; ++i) {
let cur = order[i]
- if (cur.from < pos && cur.to > pos) return i
- if ((cur.from == pos || cur.to == pos)) {
- if (found == null) {
- found = i
- } else if (compareBidiLevel(order, cur.level, order[found].level)) {
- if (cur.from != cur.to) bidiOther = found
- return i
- } else {
- if (cur.from != cur.to) bidiOther = i
- return found
- }
+ if (cur.from < ch && cur.to > ch) return i
+ if (cur.to == ch) {
+ if (cur.from != cur.to && sticky == "before") found = i
+ else bidiOther = i
}
- }
- return found
-}
-
-function moveInLine(line, pos, dir, byUnit) {
- if (!byUnit) return pos + dir
- do pos += dir
- while (pos > 0 && isExtendingChar(line.text.charAt(pos)))
- return pos
-}
-
-// This is needed in order to move 'visually' through bi-directional
-// text -- i.e., pressing left should make the cursor go left, even
-// when in RTL text. The tricky part is the 'jumps', where RTL and
-// LTR text touch each other. This often requires the cursor offset
-// to move more than one unit, in order to visually move one unit.
-export function moveVisually(line, start, dir, byUnit) {
- let bidi = getOrder(line)
- if (!bidi) return moveLogically(line, start, dir, byUnit)
- let pos = getBidiPartAt(bidi, start), part = bidi[pos]
- let target = moveInLine(line, start, part.level % 2 ? -dir : dir, byUnit)
-
- for (;;) {
- if (target > part.from && target < part.to) return target
- if (target == part.from || target == part.to) {
- if (getBidiPartAt(bidi, target) == pos) return target
- part = bidi[pos += dir]
- return (dir > 0) == part.level % 2 ? part.to : part.from
- } else {
- part = bidi[pos += dir]
- if (!part) return null
- if ((dir > 0) == part.level % 2)
- target = moveInLine(line, part.to, -1, byUnit)
- else
- target = moveInLine(line, part.from, 1, byUnit)
+ if (cur.from == ch) {
+ if (cur.from != cur.to && sticky != "before") found = i
+ else bidiOther = i
}
}
-}
-
-export function moveLogically(line, start, dir, byUnit) {
- let target = start + dir
- if (byUnit) while (target > 0 && isExtendingChar(line.text.charAt(target))) target += dir
- return target < 0 || target > line.text.length ? null : target
+ return found != null ? found : bidiOther
}
// Bidirectional ordering algorithm
@@ -118,7 +57,7 @@ export function moveLogically(line, start, dir, byUnit) {
// Returns null if characters are ordered as they appear
// (left-to-right), or an array of sections ({from, to, level}
// objects) in the order in which they occur visually.
-export let bidiOrdering = (function() {
+let bidiOrdering = (function() {
// Character types for codepoints 0 to 0xff
let lowTypes = "bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN"
// Character types for codepoints 0x600 to 0x6f9
@@ -135,16 +74,16 @@ export let bidiOrdering = (function() {
let bidiRE = /[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/
let isNeutral = /[stwN]/, isStrong = /[LRr]/, countsAsLeft = /[Lb1n]/, countsAsNum = /[1n]/
- // Browsers seem to always treat the boundaries of block elements as being L.
- let outerType = "L"
function BidiSpan(level, from, to) {
this.level = level
this.from = from; this.to = to
}
- return function(str) {
- if (!bidiRE.test(str)) return false
+ return function(str, direction) {
+ let outerType = direction == "ltr" ? "L" : "R"
+
+ if (str.length == 0 || direction == "ltr" && !bidiRE.test(str)) return false
let len = str.length, types = []
for (let i = 0; i < len; ++i)
types.push(charType(str.charCodeAt(i)))
@@ -218,7 +157,7 @@ export let bidiOrdering = (function() {
for (end = i + 1; end < len && isNeutral.test(types[end]); ++end) {}
let before = (i ? types[i-1] : outerType) == "L"
let after = (end < len ? types[end] : outerType) == "L"
- let replace = before || after ? "L" : "R"
+ let replace = before == after ? (before ? "L" : "R") : outerType
for (let j = i; j < end; ++j) types[j] = replace
i = end - 1
}
@@ -250,28 +189,26 @@ export let bidiOrdering = (function() {
if (pos < i) order.splice(at, 0, new BidiSpan(1, pos, i))
}
}
- if (order[0].level == 1 && (m = str.match(/^\s+/))) {
- order[0].from = m[0].length
- order.unshift(new BidiSpan(0, 0, m[0].length))
- }
- if (lst(order).level == 1 && (m = str.match(/\s+$/))) {
- lst(order).to -= m[0].length
- order.push(new BidiSpan(0, len - m[0].length, len))
+ if (direction == "ltr") {
+ if (order[0].level == 1 && (m = str.match(/^\s+/))) {
+ order[0].from = m[0].length
+ order.unshift(new BidiSpan(0, 0, m[0].length))
+ }
+ if (lst(order).level == 1 && (m = str.match(/\s+$/))) {
+ lst(order).to -= m[0].length
+ order.push(new BidiSpan(0, len - m[0].length, len))
+ }
}
- if (order[0].level == 2)
- order.unshift(new BidiSpan(1, order[0].to, order[0].to))
- if (order[0].level != lst(order).level)
- order.push(new BidiSpan(order[0].level, len, len))
- return order
+ return direction == "rtl" ? order.reverse() : order
}
})()
// Get the bidi ordering for the given line (and cache it). Returns
// false for lines that are fully left-to-right, and an array of
// BidiSpan objects otherwise.
-export function getOrder(line) {
+export function getOrder(line, direction) {
let order = line.order
- if (order == null) order = line.order = bidiOrdering(line.text)
+ if (order == null) order = line.order = bidiOrdering(line.text, direction)
return order
}
diff --git a/js/codemirror-5.23.0/src/util/browser.js b/js/codemirror-5.39.0/src/util/browser.js
similarity index 74%
rename from js/codemirror-5.23.0/src/util/browser.js
rename to js/codemirror-5.39.0/src/util/browser.js
index ce678a8..9fc4602 100644
--- a/js/codemirror-5.23.0/src/util/browser.js
+++ b/js/codemirror-5.39.0/src/util/browser.js
@@ -6,19 +6,21 @@ let platform = navigator.platform
export let gecko = /gecko\/\d/i.test(userAgent)
let ie_upto10 = /MSIE \d/.test(userAgent)
let ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(userAgent)
-export let ie = ie_upto10 || ie_11up
-export let ie_version = ie && (ie_upto10 ? document.documentMode || 6 : ie_11up[1])
-export let webkit = /WebKit\//.test(userAgent)
+let edge = /Edge\/(\d+)/.exec(userAgent)
+export let ie = ie_upto10 || ie_11up || edge
+export let ie_version = ie && (ie_upto10 ? document.documentMode || 6 : +(edge || ie_11up)[1])
+export let webkit = !edge && /WebKit\//.test(userAgent)
let qtwebkit = webkit && /Qt\/\d+\.\d+/.test(userAgent)
-export let chrome = /Chrome\//.test(userAgent)
+export let chrome = !edge && /Chrome\//.test(userAgent)
export let presto = /Opera\//.test(userAgent)
export let safari = /Apple Computer/.test(navigator.vendor)
export let mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(userAgent)
export let phantom = /PhantomJS/.test(userAgent)
-export let ios = /AppleWebKit/.test(userAgent) && /Mobile\/\w+/.test(userAgent)
+export let ios = !edge && /AppleWebKit/.test(userAgent) && /Mobile\/\w+/.test(userAgent)
+export let android = /Android/.test(userAgent)
// This is woefully incomplete. Suggestions for alternative methods welcome.
-export let mobile = ios || /Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(userAgent)
+export let mobile = ios || android || /webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(userAgent)
export let mac = ios || /Mac/.test(platform)
export let chromeOS = /\bCrOS\b/.test(userAgent)
export let windows = /win/i.test(platform)
diff --git a/js/codemirror-5.23.0/src/util/dom.js b/js/codemirror-5.39.0/src/util/dom.js
similarity index 87%
rename from js/codemirror-5.23.0/src/util/dom.js
rename to js/codemirror-5.39.0/src/util/dom.js
index 349fae0..04d2569 100644
--- a/js/codemirror-5.23.0/src/util/dom.js
+++ b/js/codemirror-5.39.0/src/util/dom.js
@@ -1,4 +1,4 @@
-import { ie, ios } from "./browser"
+import { ie, ios } from "./browser.js"
export function classTest(cls) { return new RegExp("(^|\\s)" + cls + "(?:$|\\s)\\s*") }
@@ -29,6 +29,12 @@ export function elt(tag, content, className, style) {
else if (content) for (let i = 0; i < content.length; ++i) e.appendChild(content[i])
return e
}
+// wrapper for elt, which removes the elt from the accessibility tree
+export function eltP(tag, content, className, style) {
+ let e = elt(tag, content, className, style)
+ e.setAttribute("role", "presentation")
+ return e
+}
export let range
if (document.createRange) range = function(node, start, end, endNode) {
@@ -68,8 +74,8 @@ export function activeElt() {
} catch(e) {
activeElement = document.body || null
}
- while (activeElement && activeElement.root && activeElement.root.activeElement)
- activeElement = activeElement.root.activeElement
+ while (activeElement && activeElement.shadowRoot && activeElement.shadowRoot.activeElement)
+ activeElement = activeElement.shadowRoot.activeElement
return activeElement
}
diff --git a/js/codemirror-5.23.0/src/util/event.js b/js/codemirror-5.39.0/src/util/event.js
similarity index 97%
rename from js/codemirror-5.23.0/src/util/event.js
rename to js/codemirror-5.39.0/src/util/event.js
index 29fd4c5..4b6c770 100644
--- a/js/codemirror-5.23.0/src/util/event.js
+++ b/js/codemirror-5.39.0/src/util/event.js
@@ -1,5 +1,5 @@
-import { mac } from "./browser"
-import { indexOf } from "./misc"
+import { mac } from "./browser.js"
+import { indexOf } from "./misc.js"
// EVENT HANDLING
diff --git a/js/codemirror-5.23.0/src/util/feature_detection.js b/js/codemirror-5.39.0/src/util/feature_detection.js
similarity index 98%
rename from js/codemirror-5.23.0/src/util/feature_detection.js
rename to js/codemirror-5.39.0/src/util/feature_detection.js
index e65881d..c33734e 100644
--- a/js/codemirror-5.23.0/src/util/feature_detection.js
+++ b/js/codemirror-5.39.0/src/util/feature_detection.js
@@ -1,5 +1,5 @@
-import { elt, range, removeChildren, removeChildrenAndAdd } from "./dom"
-import { ie, ie_version } from "./browser"
+import { elt, range, removeChildren, removeChildrenAndAdd } from "./dom.js"
+import { ie, ie_version } from "./browser.js"
// Detect drag-and-drop
export let dragAndDrop = function() {
diff --git a/js/codemirror-5.23.0/src/util/misc.js b/js/codemirror-5.39.0/src/util/misc.js
similarity index 85%
rename from js/codemirror-5.23.0/src/util/misc.js
rename to js/codemirror-5.39.0/src/util/misc.js
index 2fb9091..39661eb 100644
--- a/js/codemirror-5.23.0/src/util/misc.js
+++ b/js/codemirror-5.39.0/src/util/misc.js
@@ -28,10 +28,12 @@ export function countColumn(string, end, tabSize, startIndex, startValue) {
}
}
-export function Delayed() {this.id = null}
-Delayed.prototype.set = function(ms, f) {
- clearTimeout(this.id)
- this.id = setTimeout(f, ms)
+export class Delayed {
+ constructor() {this.id = null}
+ set(ms, f) {
+ clearTimeout(this.id)
+ this.id = setTimeout(f, ms)
+ }
}
export function indexOf(array, elt) {
@@ -124,3 +126,25 @@ export function isEmpty(obj) {
// of code points as a group.
let extendingChars = /[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/
export function isExtendingChar(ch) { return ch.charCodeAt(0) >= 768 && extendingChars.test(ch) }
+
+// Returns a number from the range [`0`; `str.length`] unless `pos` is outside that range.
+export function skipExtendingChars(str, pos, dir) {
+ while ((dir < 0 ? pos > 0 : pos < str.length) && isExtendingChar(str.charAt(pos))) pos += dir
+ return pos
+}
+
+// Returns the value from the range [`from`; `to`] that satisfies
+// `pred` and is closest to `from`. Assumes that at least `to`
+// satisfies `pred`. Supports `from` being greater than `to`.
+export function findFirst(pred, from, to) {
+ // At any point we are certain `to` satisfies `pred`, don't know
+ // whether `from` does.
+ let dir = from > to ? -1 : 1
+ for (;;) {
+ if (from == to) return from
+ let midF = (from + to) / 2, mid = dir < 0 ? Math.ceil(midF) : Math.floor(midF)
+ if (mid == from) return pred(mid) ? from : to
+ if (pred(mid)) to = mid
+ else from = mid + dir
+ }
+}
diff --git a/js/codemirror-5.23.0/src/util/operation_group.js b/js/codemirror-5.39.0/src/util/operation_group.js
similarity index 98%
rename from js/codemirror-5.23.0/src/util/operation_group.js
rename to js/codemirror-5.39.0/src/util/operation_group.js
index b8fa78a..f681594 100644
--- a/js/codemirror-5.23.0/src/util/operation_group.js
+++ b/js/codemirror-5.39.0/src/util/operation_group.js
@@ -1,4 +1,4 @@
-import { getHandlers } from "./event"
+import { getHandlers } from "./event.js"
let operationGroup = null
diff --git a/js/codemirror-5.23.0/test/comment_test.js b/js/codemirror-5.39.0/test/comment_test.js
similarity index 100%
rename from js/codemirror-5.23.0/test/comment_test.js
rename to js/codemirror-5.39.0/test/comment_test.js
diff --git a/js/codemirror-5.39.0/test/contenteditable_test.js b/js/codemirror-5.39.0/test/contenteditable_test.js
new file mode 100644
index 0000000..9130fa4
--- /dev/null
+++ b/js/codemirror-5.39.0/test/contenteditable_test.js
@@ -0,0 +1,110 @@
+(function() {
+ "use strict";
+
+ namespace = "contenteditable_";
+ var Pos = CodeMirror.Pos
+
+ function findTextNode(dom, text) {
+ if (dom instanceof CodeMirror) dom = dom.getInputField()
+ if (dom.nodeType == 1) {
+ for (var ch = dom.firstChild; ch; ch = ch.nextSibling) {
+ var found = findTextNode(ch, text)
+ if (found) return found
+ }
+ } else if (dom.nodeType == 3 && dom.nodeValue == text) {
+ return dom
+ }
+ }
+
+ function lineElt(node) {
+ for (;;) {
+ var parent = node.parentNode
+ if (/CodeMirror-code/.test(parent.className)) return node
+ node = parent
+ }
+ }
+
+ testCM("insert_text", function(cm) {
+ findTextNode(cm, "foobar").nodeValue = "foo bar"
+ cm.display.input.updateFromDOM()
+ eq(cm.getValue(), "foo bar")
+ }, {inputStyle: "contenteditable", value: "foobar"})
+
+ testCM("split_line", function(cm) {
+ cm.setSelection(Pos(2, 3))
+ var node = findTextNode(cm, "foobar")
+ node.nodeValue = "foo"
+ var lineNode = lineElt(node)
+ lineNode.parentNode.insertBefore(document.createElement("pre"), lineNode.nextSibling).textContent = "bar"
+ cm.display.input.updateFromDOM()
+ eq(cm.getValue(), "one\ntwo\nfoo\nbar\nthree\nfour\n")
+ }, {inputStyle: "contenteditable", value: "one\ntwo\nfoobar\nthree\nfour\n"})
+
+ testCM("join_line", function(cm) {
+ cm.setSelection(Pos(2, 3))
+ var node = findTextNode(cm, "foo")
+ node.nodeValue = "foobar"
+ var lineNode = lineElt(node)
+ lineNode.parentNode.removeChild(lineNode.nextSibling)
+ cm.display.input.updateFromDOM()
+ eq(cm.getValue(), "one\ntwo\nfoobar\nthree\nfour\n")
+ }, {inputStyle: "contenteditable", value: "one\ntwo\nfoo\nbar\nthree\nfour\n"})
+
+ testCM("delete_multiple", function(cm) {
+ cm.setSelection(Pos(1, 3), Pos(4, 0))
+ var text = findTextNode(cm, "two"), startLine = lineElt(text)
+ for (var i = 0; i < 3; i++)
+ startLine.parentNode.removeChild(startLine.nextSibling)
+ text.nodeValue = "twothree"
+ cm.display.input.updateFromDOM()
+ eq(cm.getValue(), "one\ntwothree\nfour\n")
+ }, {inputStyle: "contenteditable", value: "one\ntwo\nfoo\nbar\nthree\nfour\n"})
+
+ testCM("ambiguous_diff_middle", function(cm) {
+ cm.setSelection(Pos(0, 2))
+ findTextNode(cm, "baah").nodeValue = "baaah"
+ cm.display.input.updateFromDOM()
+ eqCharPos(cm.getCursor(), Pos(0, 3))
+ }, {inputStyle: "contenteditable", value: "baah"})
+
+ testCM("ambiguous_diff_start", function(cm) {
+ cm.setSelection(Pos(0, 1))
+ findTextNode(cm, "baah").nodeValue = "baaah"
+ cm.display.input.updateFromDOM()
+ eqCharPos(cm.getCursor(), Pos(0, 2))
+ }, {inputStyle: "contenteditable", value: "baah"})
+
+ testCM("ambiguous_diff_end", function(cm) {
+ cm.setSelection(Pos(0, 3))
+ findTextNode(cm, "baah").nodeValue = "baaah"
+ cm.display.input.updateFromDOM()
+ eqCharPos(cm.getCursor(), Pos(0, 4))
+ }, {inputStyle: "contenteditable", value: "baah"})
+
+ testCM("force_redraw", function(cm) {
+ findTextNode(cm, "foo").parentNode.appendChild(document.createElement("hr")).className = "inserted"
+ cm.display.input.updateFromDOM()
+ eq(byClassName(cm.getInputField(), "inserted").length, 0)
+ }, {inputStyle: "contenteditable", value: "foo"})
+
+ testCM("type_on_empty_line", function(cm) {
+ cm.setSelection(Pos(1, 0))
+ findTextNode(cm, "\u200b").nodeValue += "hello"
+ cm.display.input.updateFromDOM()
+ eq(cm.getValue(), "foo\nhello\nbar")
+ }, {inputStyle: "contenteditable", value: "foo\n\nbar"})
+
+ testCM("type_after_empty_line", function(cm) {
+ cm.setSelection(Pos(2, 0))
+ findTextNode(cm, "bar").nodeValue = "hellobar"
+ cm.display.input.updateFromDOM()
+ eq(cm.getValue(), "foo\n\nhellobar")
+ }, {inputStyle: "contenteditable", value: "foo\n\nbar"})
+
+ testCM("type_before_empty_line", function(cm) {
+ cm.setSelection(Pos(0, 3))
+ findTextNode(cm, "foo").nodeValue = "foohello"
+ cm.display.input.updateFromDOM()
+ eq(cm.getValue(), "foohello\n\nbar")
+ }, {inputStyle: "contenteditable", value: "foo\n\nbar"})
+})();
diff --git a/js/codemirror-5.23.0/test/doc_test.js b/js/codemirror-5.39.0/test/doc_test.js
similarity index 95%
rename from js/codemirror-5.23.0/test/doc_test.js
rename to js/codemirror-5.39.0/test/doc_test.js
index 5f242f6..3af20ff 100644
--- a/js/codemirror-5.23.0/test/doc_test.js
+++ b/js/codemirror-5.39.0/test/doc_test.js
@@ -163,13 +163,13 @@
testDoc("undoKeepRanges", "A='abcdefg' B
margin)
throw new Failure(label(a + " is not close to " + b + " (" + margin + ")", msg));
}
-function eqPos(a, b, msg) {
- function str(p) { return "{line:" + p.line + ",ch:" + p.ch + "}"; }
+function eqCharPos(a, b, msg) {
+ function str(p) { return "{line:" + p.line + ",ch:" + p.ch + ",sticky:" + p.sticky + "}"; }
if (a == b) return;
if (a == null) throw new Failure(label("comparing null to " + str(b), msg));
if (b == null) throw new Failure(label("comparing " + str(a) + " to null", msg));
if (a.line != b.line || a.ch != b.ch) throw new Failure(label(str(a) + " != " + str(b), msg));
}
+function eqCursorPos(a, b, msg) {
+ eqCharPos(a, b, msg);
+ if (a) eq(a.sticky, b.sticky, msg ? msg + ' (sticky)' : 'sticky');
+}
function is(a, msg) {
if (!a) throw new Failure(label("assertion failed", msg));
}
diff --git a/js/codemirror-5.23.0/test/emacs_test.js b/js/codemirror-5.39.0/test/emacs_test.js
similarity index 86%
rename from js/codemirror-5.23.0/test/emacs_test.js
rename to js/codemirror-5.39.0/test/emacs_test.js
index 628651c..412dba4 100644
--- a/js/codemirror-5.23.0/test/emacs_test.js
+++ b/js/codemirror-5.39.0/test/emacs_test.js
@@ -39,25 +39,25 @@
}, {keyMap: "emacs", value: start, mode: "javascript"});
}
- function at(line, ch) { return function(cm) { eqPos(cm.getCursor(), Pos(line, ch)); }; }
+ function at(line, ch, sticky) { return function(cm) { eqCursorPos(cm.getCursor(), Pos(line, ch, sticky)); }; }
function txt(str) { return function(cm) { eq(cm.getValue(), str); }; }
- sim("motionHSimple", "abc", "Ctrl-F", "Ctrl-F", "Ctrl-B", at(0, 1));
+ sim("motionHSimple", "abc", "Ctrl-F", "Ctrl-F", "Ctrl-B", at(0, 1, "after"));
sim("motionHMulti", "abcde",
- "Ctrl-4", "Ctrl-F", at(0, 4), "Ctrl--", "Ctrl-2", "Ctrl-F", at(0, 2),
- "Ctrl-5", "Ctrl-B", at(0, 0));
+ "Ctrl-4", "Ctrl-F", at(0, 4, "before"), "Ctrl--", "Ctrl-2", "Ctrl-F", at(0, 2, "after"),
+ "Ctrl-5", "Ctrl-B", at(0, 0, "after"));
sim("motionHWord", "abc. def ghi",
- "Alt-F", at(0, 3), "Alt-F", at(0, 8),
- "Ctrl-B", "Alt-B", at(0, 5), "Alt-B", at(0, 0));
+ "Alt-F", at(0, 3, "before"), "Alt-F", at(0, 8, "before"),
+ "Ctrl-B", "Alt-B", at(0, 5, "after"), "Alt-B", at(0, 0, "after"));
sim("motionHWordMulti", "abc. def ghi ",
- "Ctrl-3", "Alt-F", at(0, 12), "Ctrl-2", "Alt-B", at(0, 5),
- "Ctrl--", "Alt-B", at(0, 8));
+ "Ctrl-3", "Alt-F", at(0, 12, "before"), "Ctrl-2", "Alt-B", at(0, 5, "after"),
+ "Ctrl--", "Alt-B", at(0, 8, "before"));
- sim("motionVSimple", "a\nb\nc\n", "Ctrl-N", "Ctrl-N", "Ctrl-P", at(1, 0));
+ sim("motionVSimple", "a\nb\nc\n", "Ctrl-N", "Ctrl-N", "Ctrl-P", at(1, 0, "after"));
sim("motionVMulti", "a\nb\nc\nd\ne\n",
- "Ctrl-2", "Ctrl-N", at(2, 0), "Ctrl-F", "Ctrl--", "Ctrl-N", at(1, 1),
- "Ctrl--", "Ctrl-3", "Ctrl-P", at(4, 1));
+ "Ctrl-2", "Ctrl-N", at(2, 0, "after"), "Ctrl-F", "Ctrl--", "Ctrl-N", at(1, 1, "before"),
+ "Ctrl--", "Ctrl-3", "Ctrl-P", at(4, 1, "before"));
sim("killYank", "abc\ndef\nghi",
"Ctrl-F", "Ctrl-Space", "Ctrl-N", "Ctrl-N", "Ctrl-W", "Ctrl-E", "Ctrl-Y",
@@ -131,6 +131,8 @@
sim("delRegion", "abcde", "Ctrl-Space", "Ctrl-F", "Ctrl-F", "Delete", txt("cde"));
sim("backspaceRegion", "abcde", "Ctrl-Space", "Ctrl-F", "Ctrl-F", "Backspace", txt("cde"));
+ sim("backspaceDoesntAddToRing", "foobar", "Ctrl-F", "Ctrl-F", "Ctrl-F", "Ctrl-K", "Backspace", "Backspace", "Ctrl-Y", txt("fbar"));
+
testCM("save", function(cm) {
var saved = false;
CodeMirror.commands.save = function(cm) { saved = cm.getValue(); };
diff --git a/js/codemirror-5.39.0/test/html-hint-test.js b/js/codemirror-5.39.0/test/html-hint-test.js
new file mode 100644
index 0000000..4fd5393
--- /dev/null
+++ b/js/codemirror-5.39.0/test/html-hint-test.js
@@ -0,0 +1,83 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function() {
+ var Pos = CodeMirror.Pos;
+
+ namespace = "html-hint_";
+
+ testData =[
+ {
+ name: "html-element",
+ value: "\n",
+ list: [" "]
+ },
+ {
+ name: "linkref-attribute",
+ value: "
\n",
+ list: [""]
+ }
+ ];
+
+ function escapeHtmlList(o) {
+ return '
' +
+ JSON.stringify(o.list,null,2)
+ .replace(//g, ">") +
+ ''
+ }
+
+ function test(name, spec) {
+ testCM(name, function(cm) {
+ cm.setValue(spec.value);
+ cm.setCursor(spec.cursor);
+ var completion = CodeMirror.hint.html(cm);
+ if (!deepCompare(completion.list, spec.list))
+ throw new Failure("Wrong completion results. Got" +
+ escapeHtmlList(completion) +" but expected" +
+ escapeHtmlList(spec));
+ eqCharPos(completion.from, spec.from,'from-failed');
+ eqCharPos(completion.to, spec.to, 'to-failed');
+ }, {
+ value: spec.value,
+ mode: spec.mode || "text/html"
+ });
+ }
+
+ testData.forEach(function (value) {
+ // Use sane defaults
+ var lines = value.value.split(/\n/);
+ value.to = value.pos || Pos(lines.length-1, lines[lines.length-1].length);
+ value.from = value.from || Pos(lines.length-1,0);
+ value.cursor = value.cursor || value.to;
+ var name = value.name ||value.value;
+ test(name,value)
+ });
+
+ function deepCompare(a, b) {
+ if (a === b) return true;
+ if (!(a && typeof a === "object") ||
+ !(b && typeof b === "object")) return false;
+ var array = a instanceof Array
+ if ((b instanceof Array) !== array) return false;
+ if (array) {
+ if (a.length !== b.length) return false;
+ for (var i = 0; i < a.length; i++) if (!deepCompare(a[i], b[i])) return false
+ } else {
+ for (var p in a) if (!(p in b) || !deepCompare(a[p], b[p])) return false;
+ for (var p in b) if (!(p in a)) return false
+ }
+ return true
+ }
+})();
diff --git a/js/codemirror-5.23.0/test/index.html b/js/codemirror-5.39.0/test/index.html
similarity index 94%
rename from js/codemirror-5.23.0/test/index.html
rename to js/codemirror-5.39.0/test/index.html
index 6ddf5b1..d735ac3 100644
--- a/js/codemirror-5.23.0/test/index.html
+++ b/js/codemirror-5.39.0/test/index.html
@@ -15,12 +15,16 @@
+
+
+
+
@@ -31,6 +35,7 @@
+
@@ -102,6 +107,7 @@
Test Suite
+
@@ -113,6 +119,8 @@
Test Suite
+
+
@@ -121,6 +129,7 @@
Test Suite
+
@@ -141,6 +150,7 @@
Test Suite
+