DevTools: [CodeMirror] roll CodeMirror to version @e20d175

Source/devtools/front_end/cm/closebrackets.js

+// 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) {
   var DEFAULT_BRACKETS = "()[]{}''\"\"";
   var DEFAULT_EXPLODE_ON_ENTER = "[]{}";
@@ skipping 51 matching lines @@
             return CodeMirror.Pass;
           var next = cm.getRange(cur, Pos(cur.line, cur.ch + 1));
           if (!range.empty())
             curType = "surround";
           else if (left == right && next == right) {
             if (cm.getRange(cur, Pos(cur.line, cur.ch + 3)) == left + left + left)
               curType = "skipThree";
             else
               curType = "skip";
           } else if (left == right && cur.ch > 1 &&
-                     cm.getRange(Pos(cur.line, cur.ch - 2), cur) == left + left)
+                     cm.getRange(Pos(cur.line, cur.ch - 2), cur) == left + left &&
+                     (cur.ch <= 2 || cm.getRange(Pos(cur.line, cur.ch - 3), Pos(cur.line, cur.ch - 2)) != left))
             curType = "addFour";
           else if (left == right && CodeMirror.isWordChar(next))
             return CodeMirror.Pass;
           else if (cm.getLine(cur.line).length == cur.ch || closingBrackets.indexOf(next) >= 0 || SPACE_CHAR_REGEX.test(next))
             curType = "both";
           else
             return CodeMirror.Pass;
           if (!type) type = curType;
           else if (type != curType) return CodeMirror.Pass;
         }
@@ skipping 47 matching lines @@
         ranges = cm.listSelections();
         for (var i = 0; i < ranges.length; i++) {
           var line = ranges[i].head.line;
           cm.indentLine(line, null, true);
           cm.indentLine(line + 1, null, true);
         }
       });
     };
   }
 });