Fix reexecution of cells on second open of an ipynb file (microsoft#7482)

* Fix reexecution of cells on second open of an ipynb file * Fix tooltips on buttons

Author: rchiodo

news/2 Fixes/7417.md

@@ -0,0 +1 @@
+Allow cells to be reexecuted on second open of an ipynb file.

package.nls.json

@@ -340,7 +340,7 @@
  "DataScience.instructionComments": "# To add a new cell, type '#%%'\n# To add a new markdown cell, type '#%% [markdown]'\n",
  "DataScience.scrollToCellTitleFormatMessage": "Go to [{0}]",
  "DataScience.remoteDebuggerNotSupported": "Debugging while attached to a remote server is not currently supported.",
- "DataScience.save" : "Save file",
+ "DataScience.save" : "Save notebook",
  "DataScience.invalidNotebookFileError" : "{0} is not a valid notebook file. Check the file for correct json.",
  "DataScience.nativeEditorTitle" : "Notebook Editor",
  "DataScience.untitledNotebookFileName" : "Untitled",
@@ -354,13 +354,13 @@
  "DataScience.exportAsPythonFileTooltip" : "Convert and save to a python script",
  "DataScience.exportAsPythonFileTitle" : "Save as Python File",
  "DataScience.runCell" : "Run cell",
- "DataScience.deleteCell" : "Move selected cell down",
+ "DataScience.deleteCell" : "Delete cell",
  "DataScience.moveCellUp" : "Move cell up",
  "DataScience.moveCellDown" : "Move cell down",
  "DataScience.moveSelectedCellUp" : "Move selected cell up",
  "DataScience.insertBelow" : "Insert cell below",
  "DataScience.insertAbove" : "Insert cell above",
  "DataScience.addCell" : "Add cell",
- "DataScience.runAll" : "Insert cell",
+ "DataScience.runAll" : "Run all cells",
  "DataScience.convertingToPythonFile" : "Converting ipynb to python file"
 }

src/client/datascience/interactive-common/interactiveBase.ts

@@ -421,7 +421,10 @@ export abstract class InteractiveBase extends WebViewHost<IInteractiveWindowMapp
 
  protected abstract closeBecauseOfFailure(exc: Error): Promise<void>;
 
- protected clearResult(id: string): void {
+ protected async clearResult(id: string): Promise<void> {
+ // This will get called during an execution, so we need to have
+ // a notebook ready.
+ await this.ensureServerActive();
  if (this.notebook) {
  this.notebook.clear(id);
  }
@@ -460,18 +463,8 @@ export abstract class InteractiveBase extends WebViewHost<IInteractiveWindowMapp
  };
 
  try {
-
  // Make sure we're loaded first.
- try {
- traceInfo('Waiting for jupyter server and web panel ...');
- await this.startServer();
- } catch (exc) {
- // We should dispose ourselves if the load fails. Othewise the user
- // updates their install and we just fail again because the load promise is the same.
- await this.closeBecauseOfFailure(exc);
-
- throw exc;
- }
+ await this.ensureServerActive();
 
  // Then show our webpanel
  await this.show();
@@ -661,6 +654,53 @@ export abstract class InteractiveBase extends WebViewHost<IInteractiveWindowMapp
  return result;
  }
 
+ protected async addSysInfo(reason: SysInfoReason): Promise<void> {
+ if (!this.addSysInfoPromise || reason !== SysInfoReason.Start) {
+ traceInfo(`Adding sys info for ${this.id} ${reason}`);
+ const deferred = createDeferred<boolean>();
+ this.addSysInfoPromise = deferred;
+
+ // Generate a new sys info cell and send it to the web panel.
+ const sysInfo = await this.generateSysInfoCell(reason);
+ if (sysInfo) {
+ this.sendCellsToWebView([sysInfo]);
+ }
+
+ // For anything but start, tell the other sides of a live share session
+ if (reason !== SysInfoReason.Start && sysInfo) {
+ this.shareMessage(InteractiveWindowMessages.AddedSysInfo, { type: reason, sysInfoCell: sysInfo, id: this.id });
+ }
+
+ // For a restart, tell our window to reset
+ if (reason === SysInfoReason.Restart || reason === SysInfoReason.New) {
+ this.postMessage(InteractiveWindowMessages.RestartKernel).ignoreErrors();
+ if (this.notebook) {
+ this.jupyterDebugger.onRestart(this.notebook);
+ }
+ }
+
+ traceInfo(`Sys info for ${this.id} ${reason} complete`);
+ deferred.resolve(true);
+ } else if (this.addSysInfoPromise) {
+ traceInfo(`Wait for sys info for ${this.id} ${reason}`);
+ await this.addSysInfoPromise.promise;
+ }
+ }
+
+ private async ensureServerActive(): Promise<void> {
+ // Make sure we're loaded first.
+ try {
+ traceInfo('Waiting for jupyter server and web panel ...');
+ await this.startServer();
+ } catch (exc) {
+ // We should dispose ourselves if the load fails. Othewise the user
+ // updates their install and we just fail again because the load promise is the same.
+ await this.closeBecauseOfFailure(exc);
+
+ throw exc;
+ }
+ }
+
  private async startServerImpl(): Promise<void> {
  // Status depends upon if we're about to connect to existing server or not.
  const status = (await this.jupyterExecution.getServer(await this.getNotebookOptions())) ?
@@ -1077,39 +1117,6 @@ export abstract class InteractiveBase extends WebViewHost<IInteractiveWindowMapp
  return `${localize.DataScience.sysInfoURILabel()}${urlString}`;
  }
 
- private addSysInfo = async (reason: SysInfoReason): Promise<void> => {
- if (!this.addSysInfoPromise || reason !== SysInfoReason.Start) {
- traceInfo(`Adding sys info for ${this.id} ${reason}`);
- const deferred = createDeferred<boolean>();
- this.addSysInfoPromise = deferred;
-
- // Generate a new sys info cell and send it to the web panel.
- const sysInfo = await this.generateSysInfoCell(reason);
- if (sysInfo) {
- this.sendCellsToWebView([sysInfo]);
- }
-
- // For anything but start, tell the other sides of a live share session
- if (reason !== SysInfoReason.Start && sysInfo) {
- this.shareMessage(InteractiveWindowMessages.AddedSysInfo, { type: reason, sysInfoCell: sysInfo, id: this.id });
- }
-
- // For a restart, tell our window to reset
- if (reason === SysInfoReason.Restart || reason === SysInfoReason.New) {
- this.postMessage(InteractiveWindowMessages.RestartKernel).ignoreErrors();
- if (this.notebook) {
- this.jupyterDebugger.onRestart(this.notebook);
- }
- }
-
- traceInfo(`Sys info for ${this.id} ${reason} complete`);
- deferred.resolve(true);
- } else if (this.addSysInfoPromise) {
- traceInfo(`Wait for sys info for ${this.id} ${reason}`);
- await this.addSysInfoPromise.promise;
- }
- }
-
  private async checkUsable(): Promise<boolean> {
  let activeInterpreter: PythonInterpreter | undefined;
  try {

src/client/datascience/interactive-ipynb/nativeEditor.ts

@@ -40,7 +40,8 @@ import {
  INativeCommand,
  InteractiveWindowMessages,
  ISaveAll,
- ISubmitNewCell
+ ISubmitNewCell,
+ SysInfoReason
 } from '../interactive-common/interactiveWindowTypes';
 import {
  ICell,
@@ -299,22 +300,21 @@ export class NativeEditor extends InteractiveBase implements INotebookEditor {
 
  @captureTelemetry(Telemetry.ExecuteNativeCell, undefined, false)
  // tslint:disable-next-line:no-any
- protected reexecuteCell(info: ISubmitNewCell) {
+ protected async reexecuteCell(info: ISubmitNewCell): Promise<void> {
  // If there's any payload, it has the code and the id
  if (info && info.code && info.id) {
  // Update dirtiness
  this.setDirty();
 
  // Clear the result if we've run before
- this.clearResult(info.id);
+ await this.clearResult(info.id);
 
  // Send to ourselves.
  this.submitCode(info.code, Identifiers.EmptyFileName, 0, info.id).ignoreErrors();
 
  // Activate the other side, and send as if came from a file
- this.ipynbProvider.show(this.file).then(_v => {
- this.shareMessage(InteractiveWindowMessages.RemoteReexecuteCode, { code: info.code, file: Identifiers.EmptyFileName, line: 0, id: info.id, originator: this.id, debug: false });
- }).ignoreErrors();
+ await this.ipynbProvider.show(this.file);
+ this.shareMessage(InteractiveWindowMessages.RemoteReexecuteCode, { code: info.code, file: Identifiers.EmptyFileName, line: 0, id: info.id, originator: this.id, debug: false });
  }
  }
 
@@ -365,6 +365,11 @@ export class NativeEditor extends InteractiveBase implements INotebookEditor {
  // Actually don't close, just let the error bubble out
  }
 
+ protected addSysInfo(_reason: SysInfoReason): Promise<void> {
+ // No sys info in the native editor
+ return Promise.resolve();
+ }
+
  private editCell(request: IEditCell) {
  // Apply the changes to the visible cell list. We won't get an update until
  // submission otherwise