[closebrackets addon] Do not auto-close single apostrophes in comments

Make exception for auto-closing single apostrophes in comments, as per adobe/brackets#3246
codemirror · Apr 3, 2013 · c1b7ea4 · c1b7ea4
1 parent 90209f8
commit c1b7ea4
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
@@ -17,7 +17,7 @@
         if (cm.somethingSelected()) return CodeMirror.Pass;
         var cur = cm.getCursor(), line = cm.getLine(cur.line);
         if (cur.ch && cur.ch < line.length &&
-            pairs.indexOf(line.slice(cur.ch - 1, cur.ch + 1)) % 2 == 0)
+          pairs.indexOf(line.slice(cur.ch - 1, cur.ch + 1)) % 2 == 0)
           cm.replaceRange("", CodeMirror.Pos(cur.line, cur.ch - 1), CodeMirror.Pos(cur.line, cur.ch + 1));
         else
           return CodeMirror.Pass;
@@ -27,15 +27,20 @@
     for (var i = 0; i < pairs.length; i += 2) (function(left, right) {
       if (left != right) closingBrackets.push(right);
       function surround(cm) {
-          var selection = cm.getSelection();
-          cm.replaceSelection(left + selection + right);
+        var selection = cm.getSelection();
+        cm.replaceSelection(left + selection + right);
       }
       function maybeOverwrite(cm) {
         var cur = cm.getCursor(), ahead = cm.getRange(cur, CodeMirror.Pos(cur.line, cur.ch + 1));
         if (ahead != right || cm.somethingSelected()) return CodeMirror.Pass;
         else cm.execCommand("goCharRight");
       }
       map["'" + left + "'"] = function(cm) {
+        var type = cm.getTokenAt(cm.getCursor()).type;
+        if (left === "'" && type === "comment") {
+          cm.replaceSelection("'", {head: ahead, anchor: ahead});
+          return;
+        }
         if (cm.somethingSelected()) return surround(cm);
         if (left == right && maybeOverwrite(cm) != CodeMirror.Pass) return;
         var cur = cm.getCursor(), ahead = CodeMirror.Pos(cur.line, cur.ch + 1);