Changeset 3979:af2eb4115a98 for admin/js/codemirror/addon/edit/closebrackets.js

Timestamp:

06/24/19 13:04:56 (6 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Update Codemirror from 5.38.0 to 5.48.0

File:

• admin/js/codemirror/addon/edit/closebrackets.js (modified) (5 diffs)

admin/js/codemirror/addon/edit/closebrackets.js

@@ -1 +1 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
@@ -12 +12 @@
   var defaults = {
     pairs: "()[]{}''\"\"",
+    closeBefore: ")]}'\":;>",
     triples: "",
     explode: "[]{}"
@@ -110 +111 @@
     var pos = pairs.indexOf(ch);
     if (pos == -1) return CodeMirror.Pass;
+
+    var closeBefore = getOption(conf,"closeBefore");
+
     var triples = getOption(conf, "triples");
 
@@ -137 +141 @@
         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) ||
-                             /\s/.test(next))) {
+      } else if (opening && (next.length === 0 || /\s/.test(next) || closeBefore.indexOf(next) > -1)) {
         curType = "both";
       } else {
@@ -176 +178 @@
   }
 
-  function isClosingBracket(ch, pairs) {
-    var pos = pairs.lastIndexOf(ch);
-    return pos > -1 && pos % 2 == 1;
-  }
-
   function charsAround(cm, pos) {
     var str = cm.getRange(Pos(pos.line, pos.ch - 1),