diff --git a/buildroot-external/overlay/WebUI-raspmatic/www/webui/js/extern/codemirror/addon/edit/matchbrackets.js b/buildroot-external/overlay/WebUI-raspmatic/www/webui/js/extern/codemirror/addon/edit/matchbrackets.js index c342910ed5..0d1bcb662e 100644 --- a/buildroot-external/overlay/WebUI-raspmatic/www/webui/js/extern/codemirror/addon/edit/matchbrackets.js +++ b/buildroot-external/overlay/WebUI-raspmatic/www/webui/js/extern/codemirror/addon/edit/matchbrackets.js @@ -27,7 +27,7 @@ afterCursor = /(^| )cm-fat-cursor($| )/.test(cm.getWrapperElement().className) var re = bracketRegex(config) - // A cursor is defined as between two characters, but in in vim command mode + // A cursor is defined as between two characters, but in vim command mode // (i.e. not insert mode), the cursor is visually represented as a // highlighted box on top of the 2nd character. Otherwise, we allow matches // from before or after the cursor. diff --git a/buildroot-external/overlay/WebUI-raspmatic/www/webui/js/extern/codemirror/lib/codemirror.js b/buildroot-external/overlay/WebUI-raspmatic/www/webui/js/extern/codemirror/lib/codemirror.js index f4f5ec9d2c..e42b63bb8d 100644 --- a/buildroot-external/overlay/WebUI-raspmatic/www/webui/js/extern/codemirror/lib/codemirror.js +++ b/buildroot-external/overlay/WebUI-raspmatic/www/webui/js/extern/codemirror/lib/codemirror.js @@ -3425,7 +3425,7 @@ } // Compute the lines that are visible in a given viewport (defaults - // the the current scroll position). viewport may contain top, + // the current scroll position). viewport may contain top, // height, and ensure (see op.scrollToPos) properties. function visibleLines(display, doc, viewport) { var top = viewport && viewport.top != null ? Math.max(0, viewport.top) : display.scroller.scrollTop; @@ -9877,7 +9877,7 @@ addLegacyProps(CodeMirror); - CodeMirror.version = "5.65.17"; + CodeMirror.version = "5.65.18"; return CodeMirror; diff --git a/buildroot-external/overlay/WebUI-raspmatic/www/webui/js/extern/codemirror/mode/clojure/clojure.js b/buildroot-external/overlay/WebUI-raspmatic/www/webui/js/extern/codemirror/mode/clojure/clojure.js index 3305165808..78bf286606 100644 --- a/buildroot-external/overlay/WebUI-raspmatic/www/webui/js/extern/codemirror/mode/clojure/clojure.js +++ b/buildroot-external/overlay/WebUI-raspmatic/www/webui/js/extern/codemirror/mode/clojure/clojure.js @@ -281,6 +281,7 @@ CodeMirror.defineMode("clojure", function (options) { }, closeBrackets: {pairs: "()[]{}\"\""}, + fold: "brace", lineComment: ";;" }; }); diff --git a/buildroot-external/overlay/WebUI-raspmatic/www/webui/js/extern/codemirror/mode/dart/dart.js b/buildroot-external/overlay/WebUI-raspmatic/www/webui/js/extern/codemirror/mode/dart/dart.js index ba9ff3dd2c..cbbf391cc5 100644 --- a/buildroot-external/overlay/WebUI-raspmatic/www/webui/js/extern/codemirror/mode/dart/dart.js +++ b/buildroot-external/overlay/WebUI-raspmatic/www/webui/js/extern/codemirror/mode/dart/dart.js @@ -44,6 +44,8 @@ blockKeywords: set(blockKeywords), builtin: set(builtins), atoms: set(atoms), + // clike numbers without the suffixes, and with '_' separators. + number: /^(?:0x[a-f\d_]+|(?:[\d_]+\.?[\d_]*|\.[\d_]+)(?:e[-+]?[\d_]+)?)/i, hooks: { "@": function(stream) { stream.eatWhile(/[\w\$_\.]/); diff --git a/buildroot-external/overlay/WebUI-raspmatic/www/webui/js/extern/codemirror/mode/groovy/groovy.js b/buildroot-external/overlay/WebUI-raspmatic/www/webui/js/extern/codemirror/mode/groovy/groovy.js index 89d0fe0854..24d886ebb1 100644 --- a/buildroot-external/overlay/WebUI-raspmatic/www/webui/js/extern/codemirror/mode/groovy/groovy.js +++ b/buildroot-external/overlay/WebUI-raspmatic/www/webui/js/extern/codemirror/mode/groovy/groovy.js @@ -129,10 +129,8 @@ CodeMirror.defineMode("groovy", function(config) { function tokenVariableDeref(stream, state) { var next = stream.match(/^(\.|[\w\$_]+)/) - if (!next) { - state.tokenize.pop() - return state.tokenize[state.tokenize.length-1](stream, state) - } + if (!next || !stream.match(next[0] == "." ? /^[\w$_]/ : /^\./)) state.tokenize.pop() + if (!next) return state.tokenize[state.tokenize.length-1](stream, state) return next[0] == "." ? null : "variable" }