Replace newNotebook with notebookEditor in commands (microsoft#13772)

Author: DonJayamanne

package.json

@@ -861,18 +861,18 @@
  "category": "Python"
  },
  {
- "command": "python.datascience.newNotebook.removeallcells",
- "title": "%python.command.python.datascience.newNotebook.removeallcells.title%",
+ "command": "python.datascience.notebookeditor.removeallcells",
+ "title": "%python.command.python.datascience.notebookeditor.removeallcells.title%",
  "category": "Python"
  },
  {
- "command": "python.datascience.newNotebook.expandallcells",
- "title": "%python.command.python.datascience.newNotebook.expandallcells.title%",
+ "command": "python.datascience.notebookeditor.expandallcells",
+ "title": "%python.command.python.datascience.notebookeditor.expandallcells.title%",
  "category": "Python"
  },
  {
- "command": "python.datascience.newNotebook.collapseallcells",
- "title": "%python.command.python.datascience.newNotebook.collapseallcells.title%",
+ "command": "python.datascience.notebookeditor.collapseallcells",
+ "title": "%python.command.python.datascience.notebookeditor.collapseallcells.title%",
  "category": "Python"
  },
  {
@@ -1435,20 +1435,20 @@
  "when": "python.datascience.isnativeactive && python.datascience.featureenabled && python.datascience.isnotebooktrusted"
  },
  {
- "command": "python.datascience.newNotebook.removeallcells",
- "title": "%python.command.python.datascience.newNotebook.removeallcells.title%",
+ "command": "python.datascience.notebookeditor.removeallcells",
+ "title": "%python.command.python.datascience.removeallcells.title%",
  "category": "Python",
  "when": "python.datascience.featureenabled && notebookEditorFocused"
  },
  {
- "command": "python.datascience.newNotebook.expandallcells",
- "title": "%python.command.python.datascience.newNotebook.expandallcells.title%",
+ "command": "python.datascience.notebookeditor.expandallcells",
+ "title": "%python.command.python.datascience.expandallcells.title%",
  "category": "Python",
  "when": "python.datascience.featureenabled && notebookEditorFocused"
  },
  {
- "command": "python.datascience.newNotebook.collapseallcells",
- "title": "%python.command.python.datascience.newNotebook.collapseallcells.title%",
+ "command": "python.datascience.notebookeditor.collapseallcells",
+ "title": "%python.command.python.datascience.collapseallcells.title%",
  "category": "Python",
  "when": "python.datascience.featureenabled && notebookEditorFocused"
  },

package.nls.json

@@ -112,9 +112,6 @@
  "python.command.python.datascience.addcellbelow.title": "Add Empty Cell to File",
  "python.command.python.datascience.scrolltocell.title": "Scroll Cell Into View",
  "python.command.python.datascience.createnewnotebook.title": "Create New Blank Jupyter Notebook",
- "python.command.python.datascience.newNotebook.removeallcells.title": "Remove all Cells",
- "python.command.python.datascience.newNotebook.expandallcells.title": "Expand all Cells",
- "python.command.python.datascience.newNotebook.collapseallcells.title": "Collapse all Cells",
  "python.command.python.startPage.open.title": "Open Start Page",
  "python.command.python.datascience.selectJupyterInterpreter.title": "Select Interpreter to start Jupyter server",
  "Datascience.currentlySelectedJupyterInterpreterForPlaceholder": "current: {0}",

src/client/common/application/commands.ts

@@ -202,7 +202,6 @@ export interface ICommandNameArgumentTypeMapping extends ICommandNameWithoutArgu
  [DSCommands.LatestExtension]: [string];
  [DSCommands.EnableLoadingWidgetsFrom3rdPartySource]: [undefined | never];
  [DSCommands.TrustNotebook]: [undefined | never | Uri];
- [DSCommands.NewNotebookRemoveAllCells]: [];
- [DSCommands.NewNotebookExpandAllCells]: [];
- [DSCommands.NewNotebookCollapseAllCells]: [];
+ [DSCommands.NotebookEditorExpandAllCells]: [];
+ [DSCommands.NotebookEditorCollapseAllCells]: [];
 }

src/client/datascience/commands/notebookCommands.ts

@@ -32,9 +32,8 @@ export class NotebookCommands implements IDisposable {
  this.disposables.push(
  this.commandManager.registerCommand(Commands.SwitchJupyterKernel, this.switchKernel, this),
  this.commandManager.registerCommand(Commands.SetJupyterKernel, this.setKernel, this),
- this.commandManager.registerCommand(Commands.NewNotebookCollapseAllCells, this.collapseAll, this),
- this.commandManager.registerCommand(Commands.NewNotebookExpandAllCells, this.expandAll, this),
- this.commandManager.registerCommand(Commands.NewNotebookRemoveAllCells, this.removeAll, this)
+ this.commandManager.registerCommand(Commands.NotebookEditorCollapseAllCells, this.collapseAll, this),
+ this.commandManager.registerCommand(Commands.NotebookEditorExpandAllCells, this.expandAll, this)
  );
  }
  public dispose() {
@@ -53,12 +52,6 @@ export class NotebookCommands implements IDisposable {
  }
  }
 
- private removeAll() {
- if (this.notebookEditorProvider.activeEditor) {
- this.notebookEditorProvider.activeEditor.removeAllCells();
- }
- }
-
  private async switchKernel(options: ISwitchKernelOptions | undefined) {
  // If no identity, spec, or resource, look at the active editor or interactive window.
  // Only one is possible to be active at any point in time

src/client/datascience/constants.ts

@@ -109,9 +109,8 @@ export namespace Commands {
  export const TrustNotebook = 'python.datascience.notebookeditor.trust';
  export const EnableLoadingWidgetsFrom3rdPartySource =
  'python.datascience.enableLoadingWidgetScriptsFromThirdPartySource';
- export const NewNotebookRemoveAllCells = 'python.datascience.newNotebook.removeallcells';
- export const NewNotebookExpandAllCells = 'python.datascience.newNotebook.expandallcells';
- export const NewNotebookCollapseAllCells = 'python.datascience.newNotebook.collapseallcells';
+ export const NotebookEditorExpandAllCells = 'python.datascience.notebookeditor.expandallcells';
+ export const NotebookEditorCollapseAllCells = 'python.datascience.notebookeditor.collapseallcells';
 }
 
 export namespace CodeLensCommands {