Merge pull request #6994 from takluyver/set-next-cell-replace

Proposal: API to replace current cell

IPython/core/interactiveshell.py

@@ -2003,7 +2003,7 b' class InteractiveShell(SingletonConfigurable):'
                     continue
 
     @skip_doctest
-    def set_next_input(self, s):
+    def set_next_input(self, s, replace=False):
         """ Sets the 'default' input string for the next command line.
 
         Requires readline.

IPython/core/magics/code.py

@@ -353,7 +353,9 b' class CodeMagics(Magics):'
                 print('Operation cancelled.')
                 return
 
-        self.shell.set_next_input(contents)
+        contents = "# %load {}\n".format(arg_s) + contents
+
+        self.shell.set_next_input(contents, replace=True)
 
     @staticmethod
     def _find_edit_target(shell, args, opts, last_call):

IPython/html/static/notebook/js/codecell.js

@@ -389,7 +389,7 b' define(['
      * @private
      */
     CodeCell.prototype._handle_set_next_input = function (payload) {
-        var data = {'cell': this, 'text': payload.text};
+        var data = {'cell': this, 'text': payload.text, replace: payload.replace};
         this.events.trigger('set_next_input.Notebook', data);
     };
 

IPython/html/static/notebook/js/notebook.js

@@ -209,9 +209,14 b' define(['
         var that = this;
 
         this.events.on('set_next_input.Notebook', function (event, data) {
-            var index = that.find_cell_index(data.cell);
-            var new_cell = that.insert_cell_below('code',index);
-            new_cell.set_text(data.text);
+            if (data.replace) {
+                data.cell.set_text(data.text);
+                data.cell.clear_output();
+            } else {
+                var index = that.find_cell_index(data.cell);
+                var new_cell = that.insert_cell_below('code',index);
+                new_cell.set_text(data.text);
+            }
             that.dirty = true;
         });
 

IPython/kernel/zmq/zmqshell.py

@@ -447,12 +447,13 b' class ZMQInteractiveShell(InteractiveShell):'
 
         return exc_content
 
-    def set_next_input(self, text):
+    def set_next_input(self, text, replace=False):
         """Send the specified text to the frontend to be presented at the next
         input cell."""
         payload = dict(
             source='set_next_input',
-            text=text
+            text=text,
+            replace=replace,
         )
         self.payload_manager.write_payload(payload)
     

docs/source/development/messaging.rst

@@ -429,6 +429,9 b' The main example being ``%load``.'
       "source": "set_next_input",
       # the text contents of the cell to create
       "text": "some cell content",
+      # If true, replace the current cell in document UIs instead of inserting
+      # a cell. Ignored in console UIs.
+      "replace": bool,
     }
 
 **edit**: open a file for editing.