Merge pull request #266 from TimNN/hijack-single-quote

alexcrichton · web-flow · commit b63a21e1d733 · 2016-12-16T10:39:37.000-08:00
Hijack single quote (and update ace again)
diff --git a/static/web.html b/static/web.html
@@ -10,15 +10,15 @@
         <!-- web.css and web.js need cache busting; increment the numbers when you make changes -->
         <link rel="stylesheet" href="web.css?5">
         <link rel="shortcut icon" href="https://doc.rust-lang.org/favicon.ico"/>
-        <script src="https://cdn.jsdelivr.net/ace/1.2.3/min/ace.js"
-                integrity="sha512-lp7lBcKlkYx0jlja+DwHOHRk8LPaxvP8MuTlxAFgOpUYNib+59G1IwsxLBIFYwrkxYaBmn/oF9TWtDSEY5Ph+w=="
+        <script src="https://cdn.jsdelivr.net/ace/1.2.6/min/ace.js"
+                integrity="sha512-Y/M43OHLyvSuqF2JuQU9RIerW7fH7i/h/7AokQPIXhoYiHIxKXYDCWcuyRSXiVCGGtnfYoIBklTZ4/t26Lrr/A=="
                 crossorigin="anonymous"
                 charset="utf-8"></script>
-        <script src="https://cdn.jsdelivr.net/ace/1.2.3/min/ext-themelist.js"
-                integrity="sha512-F7PRyMnRbqZEM6kS5YAvxekuwessnK2eIJ3hnxTqpD+5e8lz5K6aa4pH0puO2Gip1CYgCHjvdgXS5+64lsAXog=="
+        <script src="https://cdn.jsdelivr.net/ace/1.2.6/min/ext-themelist.js"
+                integrity="sha512-ZdrBduTZxDAOqGKxKVuFtIVU0wD82q0HXnUEj8/KBHZ9DbQuuAjfMZ7yyBnh3vzkOtMQex9jj8EuypRD+KGNSA=="
                 crossorigin="anonymous"
                 charset="utf-8"></script>
-        <script src="web.js?12"></script>
+        <script src="web.js?13"></script>
     </head>
     <body>
         <form id="control">
diff --git a/static/web.js b/static/web.js
@@ -734,6 +734,42 @@
             bindKey: {win: "Ctrl-Enter", mac: "Ctrl-Enter"}
         });
 
+        // ACE uses the "cstyle" behaviour for all languages by default, which
+        // gives us nice things like quote and paren autopairing. However this
+        // also autopairs single quotes, which makes writing lifetimes annoying.
+        // To avoid having to duplicate the other functionality provided by the
+        // cstyle behaviour, we work around this situation by hijacking the
+        // single quote as a hotkey and modifying the document ourselves, which
+        // does not trigger this behaviour.
+        editor.commands.addCommand({
+            name: "rust_no_single_quote_autopairing",
+            exec: function(editor, line) {
+                var sess = editor.getSession();
+                var doc = sess.getDocument();
+                var selection = sess.getSelection();
+                var ranges = selection.getAllRanges();
+                var prev_range = null;
+
+                // no selection = zero width range, so we don't need to handle this case specially
+                // start from the back, so changes to earlier ranges don't invalidate later ranges
+                for (var i = ranges.length - 1; i >= 0; i--) {
+                    // sanity check: better to do no modification than to do something wrong
+                    // see the compareRange docs:
+                    // https://github.com/ajaxorg/ace/blob/v1.2.6/lib/ace/range.js#L106-L120
+                    if (prev_range && prev_range.compareRange(ranges[i]) != -2) {
+                        console.log("ranges intersect or are not in ascending order, skipping",
+                                    ranges[i]);
+                    }
+                    prev_range = ranges[i];
+
+                    doc.replace(ranges[i], "'");
+                }
+                // the selection contents were replaced, so clear the selection
+                selection.clearSelection();
+            },
+            bindKey: {win: "'", mac: "'"},
+        });
+
         // We’re all pretty much agreed that such an obscure command as transposing
         // letters hogging Ctrl-T, normally “open new tab”, is a bad thing.
         var transposeletters = editor.commands.commands.transposeletters;
