diff --git a/vendor/codemirror/README.md b/vendor/codemirror/README.md index 8ae3424d..4a1b2c57 100644 --- a/vendor/codemirror/README.md +++ b/vendor/codemirror/README.md @@ -1,4 +1,4 @@ -## CodeMirror v5.39.0 +## CodeMirror v5.39.2 List of essential folders & files copied from `node_modules/codemirror` to `vendor/codemirror`: diff --git a/vendor/codemirror/addon/hint/show-hint.js b/vendor/codemirror/addon/hint/show-hint.js index dae450db..26dc0f00 100644 --- a/vendor/codemirror/addon/hint/show-hint.js +++ b/vendor/codemirror/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; @@ -200,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; diff --git a/vendor/codemirror/lib/codemirror.js b/vendor/codemirror/lib/codemirror.js index 1a0656a1..85d16f1c 100644 --- a/vendor/codemirror/lib/codemirror.js +++ b/vendor/codemirror/lib/codemirror.js @@ -5707,7 +5707,7 @@ LineWidget.prototype.changed = function () { this.height = null; var diff = widgetHeight(this) - oldH; if (!diff) { return } - updateLineHeight(line, line.height + diff); + if (!lineIsHidden(this.doc, line)) { updateLineHeight(line, line.height + diff); } if (cm) { runInOp(cm, function () { cm.curOp.forceUpdate = true; @@ -6634,7 +6634,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 = { @@ -6652,7 +6652,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; @@ -7785,6 +7785,7 @@ function CodeMirror$1(place, options) { var doc = options.value; 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; var input = new CodeMirror$1.inputStyles[options.inputStyle](this); @@ -9688,7 +9689,7 @@ CodeMirror$1.fromTextArea = fromTextArea; addLegacyProps(CodeMirror$1); -CodeMirror$1.version = "5.39.0"; +CodeMirror$1.version = "5.39.2"; return CodeMirror$1; diff --git a/vendor/codemirror/theme/darcula.css b/vendor/codemirror/theme/darcula.css index 7240d39b..66729e9d 100644 --- a/vendor/codemirror/theme/darcula.css +++ b/vendor/codemirror/theme/darcula.css @@ -32,15 +32,15 @@ .cm-s-darcula span.cm-builtin { color: #A9B7C6; } .cm-s-darcula { font-family: Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;} -.cm-s-darcula .CodeMirror-matchingbracket { outline:1px solid #A9B7C6; color: yellow !important; } +.cm-s-darcula .CodeMirror-matchingbracket { background-color: #3b514d; color: yellow !important; } -.CodeMirror-hints { +.CodeMirror-hints.darcula { font-family: Menlo, Monaco, Consolas, 'Courier New', monospace; color: #9c9e9e; background-color: #3b3e3f !important; } -.CodeMirror-hint-active { +.CodeMirror-hints.darcula .CodeMirror-hint-active { background-color: #494d4e !important; color: #9c9e9e !important; } diff --git a/vendor/codemirror/theme/idea.css b/vendor/codemirror/theme/idea.css index 5cdb883e..eab36717 100644 --- a/vendor/codemirror/theme/idea.css +++ b/vendor/codemirror/theme/idea.css @@ -30,13 +30,13 @@ .cm-s-idea .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; } -.CodeMirror-hints { +.CodeMirror-hints.idea { font-family: Menlo, Monaco, Consolas, 'Courier New', monospace; color: #616569; background-color: #ebf3fd !important; } -.CodeMirror-hint-active { +.CodeMirror-hints.idea .CodeMirror-hint-active { background-color: #a2b8c9 !important; color: #5c6065 !important; } \ No newline at end of file