Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1726)

Unified Diff: Source/devtools/front_end/cm/closebrackets.js

Issue 354833004: DevTools: [CodeMirror] roll CodeMirror to version @e20d175 (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: address comments Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/devtools/front_end/cm/clike.js ('k') | Source/devtools/front_end/cm/codemirror.css » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/devtools/front_end/cm/closebrackets.js
diff --git a/Source/devtools/front_end/cm/closebrackets.js b/Source/devtools/front_end/cm/closebrackets.js
index 6cabed6ecad4807989c7e3826076995bb82dad73..83d4229f47b446824a38b0e9c658744c5cfaf7d3 100644
--- a/Source/devtools/front_end/cm/closebrackets.js
+++ b/Source/devtools/front_end/cm/closebrackets.js
@@ -1,3 +1,6 @@
+// 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"));
@@ -69,7 +72,8 @@
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;
« no previous file with comments | « Source/devtools/front_end/cm/clike.js ('k') | Source/devtools/front_end/cm/codemirror.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698