@jupyterlab/notebook-extension 3.4.1 → 4.0.0-alpha.10

package/lib/index.js

@@ -5,23 +5,26 @@
  * @module notebook-extension
  */
 import { ILabShell, ILayoutRestorer } from '@jupyterlab/application';
-import { createToolbarFactory, Dialog, ICommandPalette, InputDialog, ISessionContextDialogs, IToolbarWidgetRegistry, MainAreaWidget, sessionContextDialogs, showDialog, Toolbar, WidgetTracker } from '@jupyterlab/apputils';
+import { createToolbarFactory, Dialog, ICommandPalette, IKernelStatusModel, InputDialog, ISanitizer, ISessionContextDialogs, IToolbarWidgetRegistry, MainAreaWidget, sessionContextDialogs, showDialog, Toolbar, WidgetTracker } from '@jupyterlab/apputils';
 import { MarkdownCell } from '@jupyterlab/cells';
-import { IEditorServices } from '@jupyterlab/codeeditor';
+import { IEditorServices, IPositionModel } from '@jupyterlab/codeeditor';
 import { PageConfig } from '@jupyterlab/coreutils';
 import { IDocumentManager } from '@jupyterlab/docmanager';
 import { ToolbarItems as DocToolbarItems } from '@jupyterlab/docmanager-extension';
+import { ISearchProviderRegistry } from '@jupyterlab/documentsearch';
 import { IFileBrowserFactory } from '@jupyterlab/filebrowser';
 import { ILauncher } from '@jupyterlab/launcher';
 import { IMainMenu } from '@jupyterlab/mainmenu';
-import { CommandEditStatus, ExecutionIndicator, INotebookTools, INotebookTracker, INotebookWidgetFactory, NotebookActions, NotebookModelFactory, NotebookPanel, NotebookTools, NotebookTracker, NotebookTrustStatus, NotebookWidgetFactory, StaticNotebook, ToolbarItems } from '@jupyterlab/notebook';
+import { CommandEditStatus, ExecutionIndicator, INotebookTools, INotebookTracker, INotebookWidgetFactory, NotebookActions, NotebookModelFactory, NotebookPanel, NotebookSearchProvider, NotebookToCFactory, NotebookTools, NotebookTracker, NotebookTrustStatus, NotebookWidgetFactory, StaticNotebook, ToolbarItems } from '@jupyterlab/notebook';
 import { IPropertyInspectorProvider } from '@jupyterlab/property-inspector';
-import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
+import { IMarkdownParser, IRenderMimeRegistry } from '@jupyterlab/rendermime';
 import { ISettingRegistry } from '@jupyterlab/settingregistry';
 import { IStateDB } from '@jupyterlab/statedb';
 import { IStatusBar } from '@jupyterlab/statusbar';
+import { ITableOfContentsRegistry } from '@jupyterlab/toc';
 import { ITranslator, nullTranslator } from '@jupyterlab/translation';
 import { addAboveIcon, addBelowIcon, buildIcon, copyIcon, cutIcon, duplicateIcon, moveDownIcon, moveUpIcon, notebookIcon, pasteIcon } from '@jupyterlab/ui-components';
+import { ICompletionProviderManager } from '@jupyterlab/completer';
 import { ArrayExt } from '@lumino/algorithm';
 import { JSONExt, UUID } from '@lumino/coreutils';
 import { DisposableSet } from '@lumino/disposable';
@@ -41,9 +44,11 @@ var CommandIDs;
     CommandIDs.restartRunAll = 'notebook:restart-run-all';
     CommandIDs.reconnectToKernel = 'notebook:reconnect-to-kernel';
     CommandIDs.changeKernel = 'notebook:change-kernel';
+    CommandIDs.getKernel = 'notebook:get-kernel';
     CommandIDs.createConsole = 'notebook:create-console';
     CommandIDs.createOutputView = 'notebook:create-output-view';
     CommandIDs.clearAllOutputs = 'notebook:clear-all-cell-outputs';
+    CommandIDs.shutdown = 'notebook:shutdown-kernel';
     CommandIDs.closeAndShutdown = 'notebook:close-and-shutdown';
     CommandIDs.trust = 'notebook:trust';
     CommandIDs.exportToFormat = 'notebook:export-to-format';
@@ -72,6 +77,10 @@ var CommandIDs;
     CommandIDs.insertBelow = 'notebook:insert-cell-below';
     CommandIDs.selectAbove = 'notebook:move-cursor-up';
     CommandIDs.selectBelow = 'notebook:move-cursor-down';
+    CommandIDs.selectHeadingAboveOrCollapse = 'notebook:move-cursor-heading-above-or-collapse';
+    CommandIDs.selectHeadingBelowOrExpand = 'notebook:move-cursor-heading-below-or-expand';
+    CommandIDs.insertHeadingAbove = 'notebook:insert-heading-above';
+    CommandIDs.insertHeadingBelow = 'notebook:insert-heading-below';
     CommandIDs.extendAbove = 'notebook:extend-marked-cells-above';
     CommandIDs.extendTop = 'notebook:extend-marked-cells-top';
     CommandIDs.extendBelow = 'notebook:extend-marked-cells-below';
@@ -87,6 +96,8 @@ var CommandIDs;
     CommandIDs.toggleAllLines = 'notebook:toggle-all-cell-line-numbers';
     CommandIDs.undoCellAction = 'notebook:undo-cell-action';
     CommandIDs.redoCellAction = 'notebook:redo-cell-action';
+    CommandIDs.redo = 'notebook:redo';
+    CommandIDs.undo = 'notebook:undo';
     CommandIDs.markdown1 = 'notebook:change-cell-to-heading-1';
     CommandIDs.markdown2 = 'notebook:change-cell-to-heading-2';
     CommandIDs.markdown3 = 'notebook:change-cell-to-heading-3';
@@ -108,10 +119,13 @@ var CommandIDs;
     CommandIDs.selectLastRunCell = 'notebook:select-last-run-cell';
     CommandIDs.replaceSelection = 'notebook:replace-selection';
     CommandIDs.autoClosingBrackets = 'notebook:toggle-autoclosing-brackets';
-    CommandIDs.toggleCollapseCmd = 'Collapsible_Headings:Toggle_Collapse';
-    CommandIDs.collapseAllCmd = 'Collapsible_Headings:Collapse_All';
-    CommandIDs.expandAllCmd = 'Collapsible_Headings:Expand_All';
+    CommandIDs.toggleCollapseCmd = 'notebook:toggle-heading-collapse';
+    CommandIDs.collapseAllCmd = 'notebook:collapse-all-headings';
+    CommandIDs.expandAllCmd = 'notebook:expand-all-headings';
     CommandIDs.copyToClipboard = 'notebook:copy-to-clipboard';
+    CommandIDs.invokeCompleter = 'completer:invoke-notebook';
+    CommandIDs.selectCompleter = 'completer:select-notebook';
+    CommandIDs.tocRunCells = 'toc:run-cells';
 })(CommandIDs || (CommandIDs = {}));
 /**
  * The name of the factory that creates notebooks.
@@ -300,6 +314,9 @@ export const exportPlugin = {
         };
         commands.addCommand(CommandIDs.exportToFormat, {
             label: args => {
+                if (args.label === undefined) {
+                    return trans.__('Save and Export Notebook to the given `format`.');
+                }
                 const formatLabel = args['label'];
                 return args['isPalette']
                     ? trans.__('Save and Export Notebook: %1', formatLabel)
@@ -447,11 +464,85 @@ const codeConsolePlugin = {
  * A plugin to copy CodeCell outputs.
  */
 const copyOutputPlugin = {
-    id: '@jupyterlab/notebook-extensions:copy-output',
+    id: '@jupyterlab/notebook-extension:copy-output',
     activate: activateCopyOutput,
     requires: [ITranslator, INotebookTracker],
     autoStart: true
 };
+/**
+ * Kernel status indicator.
+ */
+const kernelStatus = {
+    id: '@jupyterlab/notebook-extension:kernel-status',
+    activate: (app, tracker, kernelStatus) => {
+        const provider = (widget) => {
+            let session = null;
+            if (widget && tracker.has(widget)) {
+                return widget.sessionContext;
+            }
+            return session;
+        };
+        kernelStatus.addSessionProvider(provider);
+    },
+    requires: [INotebookTracker, IKernelStatusModel],
+    autoStart: true
+};
+/**
+ * Cursor position.
+ */
+const lineColStatus = {
+    id: '@jupyterlab/notebook-extension:cursor-position',
+    activate: (app, tracker, positionModel) => {
+        let previousWidget = null;
+        const provider = (widget) => {
+            var _a, _b, _c, _d;
+            let editor = null;
+            if (widget !== previousWidget) {
+                previousWidget === null || previousWidget === void 0 ? void 0 : previousWidget.content.activeCellChanged.disconnect(positionModel.update);
+                previousWidget = null;
+                if (widget && tracker.has(widget)) {
+                    widget.content.activeCellChanged.connect(positionModel.update);
+                    editor = (_b = (_a = widget.content.activeCell) === null || _a === void 0 ? void 0 : _a.editor) !== null && _b !== void 0 ? _b : null;
+                    previousWidget = widget;
+                }
+            }
+            else if (widget) {
+                editor = (_d = (_c = widget.content.activeCell) === null || _c === void 0 ? void 0 : _c.editor) !== null && _d !== void 0 ? _d : null;
+            }
+            return editor;
+        };
+        positionModel.addEditorProvider(provider);
+    },
+    requires: [INotebookTracker, IPositionModel],
+    autoStart: true
+};
+const completerPlugin = {
+    id: '@jupyterlab/notebook-extension:completer',
+    requires: [INotebookTracker],
+    optional: [ICompletionProviderManager, ITranslator],
+    activate: activateNotebookCompleterService,
+    autoStart: true
+};
+/**
+ * A plugin to search notebook documents
+ */
+const searchProvider = {
+    id: '@jupyterlab/notebook-extension:search',
+    requires: [ISearchProviderRegistry],
+    autoStart: true,
+    activate: (app, registry) => {
+        registry.add('jp-notebookSearchProvider', NotebookSearchProvider);
+    }
+};
+const tocPlugin = {
+    id: '@jupyterlab/notebook-extension:toc',
+    requires: [INotebookTracker, ITableOfContentsRegistry, ISanitizer],
+    optional: [IMarkdownParser],
+    autoStart: true,
+    activate: (app, tracker, tocRegistry, sanitizer, mdParser) => {
+        tocRegistry.add(new NotebookToCFactory(tracker, mdParser, sanitizer));
+    }
+};
 /**
  * Export the plugins as default.
  */
@@ -467,7 +558,12 @@ const plugins = [
     logNotebookOutput,
     clonedOutputsPlugin,
     codeConsolePlugin,
-    copyOutputPlugin
+    copyOutputPlugin,
+    kernelStatus,
+    lineColStatus,
+    completerPlugin,
+    searchProvider,
+    tocPlugin
 ];
 export default plugins;
 /**
@@ -478,7 +574,9 @@ function activateNotebookTools(app, tracker, editorServices, state, translator,
     const id = 'notebook-tools';
     const notebookTools = new NotebookTools({ tracker, translator });
     const activeCellTool = new NotebookTools.ActiveCellTool();
+    const editable = NotebookTools.createEditableToggle(translator);
     const slideShow = NotebookTools.createSlideShowSelector(translator);
+    const tocBaseNumbering = NotebookTools.createToCBaseNumbering(translator);
     const editorFactory = editorServices.factoryService.newInlineEditor;
     const cellMetadataEditor = new NotebookTools.CellMetadataEditorTool({
         editorFactory,
@@ -546,7 +644,9 @@ function activateNotebookTools(app, tracker, editorServices, state, translator,
     notebookTools.title.caption = trans.__('Notebook Tools');
     notebookTools.id = id;
     notebookTools.addItem({ tool: activeCellTool, section: 'common', rank: 1 });
-    notebookTools.addItem({ tool: slideShow, section: 'common', rank: 2 });
+    notebookTools.addItem({ tool: editable, section: 'common', rank: 2 });
+    notebookTools.addItem({ tool: slideShow, section: 'common', rank: 3 });
+    notebookTools.addItem({ tool: tocBaseNumbering, section: 'common', rank: 4 });
     notebookTools.addItem({
         tool: cellMetadataEditor,
         section: 'advanced',
@@ -576,18 +676,20 @@ function activateWidgetFactory(app, contentFactory, editorServices, rendermime,
     const { commands } = app;
     let toolbarFactory;
     // Register notebook toolbar widgets
-    toolbarRegistry.registerFactory(FACTORY, 'save', panel => DocToolbarItems.createSaveButton(commands, panel.context.fileChanged));
-    toolbarRegistry.registerFactory(FACTORY, 'cellType', panel => ToolbarItems.createCellTypeItem(panel, translator));
-    toolbarRegistry.registerFactory(FACTORY, 'kernelName', panel => Toolbar.createKernelNameItem(panel.sessionContext, sessionContextDialogs, translator));
-    toolbarRegistry.registerFactory(FACTORY, 'executionProgress', panel => {
+    toolbarRegistry.addFactory(FACTORY, 'save', panel => DocToolbarItems.createSaveButton(commands, panel.context.fileChanged));
+    toolbarRegistry.addFactory(FACTORY, 'cellType', panel => ToolbarItems.createCellTypeItem(panel, translator));
+    toolbarRegistry.addFactory(FACTORY, 'kernelName', panel => Toolbar.createKernelNameItem(panel.sessionContext, sessionContextDialogs, translator));
+    toolbarRegistry.addFactory(FACTORY, 'executionProgress', panel => {
         return ExecutionIndicator.createExecutionIndicatorItem(panel, translator, settingRegistry === null || settingRegistry === void 0 ? void 0 : settingRegistry.load(trackerPlugin.id));
     });
     if (settingRegistry) {
         // Create the factory
         toolbarFactory = createToolbarFactory(toolbarRegistry, settingRegistry, FACTORY, PANEL_SETTINGS, translator);
     }
+    const trans = translator.load('jupyterlab');
     const factory = new NotebookWidgetFactory({
         name: FACTORY,
+        label: trans.__('Notebook'),
         fileTypes: ['notebook'],
         modelName: 'notebook',
         defaultFor: ['notebook'],
@@ -629,7 +731,7 @@ function activateClonedOutputs(app, docManager, notebookTracker, translator, res
         return Private.isEnabledAndSingleSelected(shell, notebookTracker);
     };
     commands.addCommand(CommandIDs.createOutputView, {
-        label: trans.__('Create New View for Output'),
+        label: trans.__('Create New View for Cell Output'),
         execute: async (args) => {
             var _a;
             let cell;
@@ -662,7 +764,8 @@ function activateClonedOutputs(app, docManager, notebookTracker, translator, res
             const widget = new MainAreaWidget({ content });
             current.context.addSibling(widget, {
                 ref: current.id,
-                mode: 'split-bottom'
+                mode: 'split-bottom',
+                type: 'Cloned Output'
             });
             const updateCloned = () => {
                 void clonedOutputs.save(widget);
@@ -870,8 +973,11 @@ function activateCopyOutput(app, translator, tracker) {
 function activateNotebookHandler(app, factory, translator, palette, browserFactory, launcher, restorer, mainMenu, settingRegistry, sessionDialogs) {
     const trans = translator.load('jupyterlab');
     const services = app.serviceManager;
-    const { commands } = app;
+    const { commands, shell } = app;
     const tracker = new NotebookTracker({ namespace: 'notebook' });
+    const isEnabled = () => {
+        return Private.isEnabled(shell, tracker);
+    };
     // Fetch settings if possible.
     const fetchSettings = settingRegistry
         ? settingRegistry.load(trackerPlugin.id)
@@ -930,7 +1036,7 @@ function activateNotebookHandler(app, factory, translator, palette, browserFacto
         disableDocumentWideUndoRedo: factory.notebookConfig.disableDocumentWideUndoRedo
     });
     registry.addModelFactory(modelFactory);
-    addCommands(app, tracker, translator, sessionDialogs);
+    addCommands(app, tracker, translator, sessionDialogs, isEnabled);
     if (palette) {
         populatePalette(palette, translator);
     }
@@ -968,6 +1074,8 @@ function activateNotebookHandler(app, factory, translator, palette, browserFacto
         const raw = Object.assign(Object.assign({}, StaticNotebook.defaultEditorConfig.raw), settings.get('rawCellConfig').composite);
         factory.editorConfig = { code, markdown, raw };
         factory.notebookConfig = {
+            showHiddenCellsButton: settings.get('showHiddenCellsButton')
+                .composite,
             scrollPastEnd: settings.get('scrollPastEnd').composite,
             defaultCell: settings.get('defaultCell').composite,
             recordTiming: settings.get('recordTiming').composite,
@@ -986,7 +1094,7 @@ function activateNotebookHandler(app, factory, translator, palette, browserFacto
                 .composite,
             sideBySideRightMarginOverride: settings.get('sideBySideRightMarginOverride').composite
         };
-        const sideBySideMarginStyle = `.jp-mod-sideBySide.jp-Notebook .jp-Notebook-cell { 
+        const sideBySideMarginStyle = `.jp-mod-sideBySide.jp-Notebook .jp-Notebook-cell {
       margin-left: ${factory.notebookConfig.sideBySideLeftMarginOverride} !important;
       margin-right: ${factory.notebookConfig.sideBySideRightMarginOverride} !important;`;
         const sideBySideMarginTag = document.getElementById(SIDE_BY_SIDE_STYLE_ID);
@@ -1007,7 +1115,7 @@ function activateNotebookHandler(app, factory, translator, palette, browserFacto
     }
     // Add main menu notebook menu.
     if (mainMenu) {
-        populateMenus(app, mainMenu, tracker, translator, sessionDialogs);
+        populateMenus(mainMenu, tracker, sessionDialogs, isEnabled);
     }
     // Utility function to create a new notebook.
     const createNew = (cwd, kernelName) => {
@@ -1081,6 +1189,71 @@ function activateNotebookHandler(app, factory, translator, palette, browserFacto
     }
     return tracker;
 }
+/**
+ * Activate the completer service for notebook.
+ */
+function activateNotebookCompleterService(app, notebooks, manager, translator) {
+    if (!manager) {
+        return;
+    }
+    const trans = (translator !== null && translator !== void 0 ? translator : nullTranslator).load('jupyterlab');
+    app.commands.addCommand(CommandIDs.invokeCompleter, {
+        label: trans.__('Display the completion helper.'),
+        execute: args => {
+            var _a;
+            const panel = notebooks.currentWidget;
+            if (panel && ((_a = panel.content.activeCell) === null || _a === void 0 ? void 0 : _a.model.type) === 'code') {
+                manager.invoke(panel.id);
+            }
+        }
+    });
+    app.commands.addCommand(CommandIDs.selectCompleter, {
+        label: trans.__('Select the completion suggestion.'),
+        execute: () => {
+            const id = notebooks.currentWidget && notebooks.currentWidget.id;
+            if (id) {
+                return manager.select(id);
+            }
+        }
+    });
+    app.commands.addKeyBinding({
+        command: CommandIDs.selectCompleter,
+        keys: ['Enter'],
+        selector: '.jp-Notebook .jp-mod-completer-active'
+    });
+    const updateCompleter = async (_, notebook) => {
+        var _a, _b;
+        const completerContext = {
+            editor: (_b = (_a = notebook.content.activeCell) === null || _a === void 0 ? void 0 : _a.editor) !== null && _b !== void 0 ? _b : null,
+            session: notebook.sessionContext.session,
+            widget: notebook
+        };
+        await manager.updateCompleter(completerContext);
+        notebook.content.activeCellChanged.connect((_, cell) => {
+            const newCompleterContext = {
+                editor: cell.editor,
+                session: notebook.sessionContext.session,
+                widget: notebook
+            };
+            manager.updateCompleter(newCompleterContext).catch(console.error);
+        });
+        notebook.sessionContext.sessionChanged.connect(() => {
+            var _a, _b;
+            const newCompleterContext = {
+                editor: (_b = (_a = notebook.content.activeCell) === null || _a === void 0 ? void 0 : _a.editor) !== null && _b !== void 0 ? _b : null,
+                session: notebook.sessionContext.session,
+                widget: notebook
+            };
+            manager.updateCompleter(newCompleterContext).catch(console.error);
+        });
+    };
+    notebooks.widgetAdded.connect(updateCompleter);
+    manager.activeProvidersChanged.connect(() => {
+        notebooks.forEach(panel => {
+            updateCompleter(undefined, panel).catch(e => console.error(e));
+        });
+    });
+}
 // Get the current widget and activate unless the args specify otherwise.
 function getCurrent(tracker, shell, args) {
     const widget = tracker.currentWidget;
@@ -1093,13 +1266,10 @@ function getCurrent(tracker, shell, args) {
 /**
  * Add the notebook commands to the application's command registry.
  */
-function addCommands(app, tracker, translator, sessionDialogs) {
+function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
     const trans = translator.load('jupyterlab');
     const { commands, shell } = app;
     sessionDialogs = sessionDialogs !== null && sessionDialogs !== void 0 ? sessionDialogs : sessionContextDialogs;
-    const isEnabled = () => {
-        return Private.isEnabled(shell, tracker);
-    };
     const isEnabledAndSingleSelected = () => {
         return Private.isEnabledAndSingleSelected(shell, tracker);
     };
@@ -1230,8 +1400,19 @@ function addCommands(app, tracker, translator, sessionDialogs) {
         },
         isEnabled
     });
+    commands.addCommand(CommandIDs.shutdown, {
+        label: trans.__('Shut Down Kernel'),
+        execute: args => {
+            const current = getCurrent(tracker, shell, args);
+            if (!current) {
+                return;
+            }
+            return current.context.sessionContext.shutdown();
+        },
+        isEnabled
+    });
     commands.addCommand(CommandIDs.closeAndShutdown, {
-        label: trans.__('Close and Shut Down'),
+        label: trans.__('Close and Shut Down Notebook'),
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (!current) {
@@ -1244,7 +1425,9 @@ function addCommands(app, tracker, translator, sessionDialogs) {
                 buttons: [Dialog.cancelButton(), Dialog.warnButton()]
             }).then(result => {
                 if (result.button.accept) {
-                    return current.context.sessionContext.shutdown().then(() => {
+                    return commands
+                        .execute(CommandIDs.shutdown, { activate: false })
+                        .then(() => {
                         current.dispose();
                     });
                 }
@@ -1264,59 +1447,48 @@ function addCommands(app, tracker, translator, sessionDialogs) {
         isEnabled
     });
     commands.addCommand(CommandIDs.restartClear, {
-        label: trans.__('Restart Kernel and Clear All Outputs…'),
-        execute: args => {
-            const current = getCurrent(tracker, shell, args);
-            if (current) {
-                const { content, sessionContext } = current;
-                return sessionDialogs.restart(sessionContext, translator).then(() => {
-                    NotebookActions.clearAllOutputs(content);
-                });
+        label: trans.__('Restart Kernel and Clear Outputs of All Cells…'),
+        caption: trans.__('Restart the kernel and clear all outputs of all cells'),
+        execute: async () => {
+            const restarted = await commands.execute(CommandIDs.restart, {
+                activate: false
+            });
+            if (restarted) {
+                await commands.execute(CommandIDs.clearAllOutputs);
             }
         },
         isEnabled
     });
     commands.addCommand(CommandIDs.restartAndRunToSelected, {
         label: trans.__('Restart Kernel and Run up to Selected Cell…'),
-        execute: args => {
-            const current = getCurrent(tracker, shell, args);
-            if (current) {
-                const { context, content } = current;
-                return sessionDialogs
-                    .restart(current.sessionContext, translator)
-                    .then(restarted => {
-                    if (restarted) {
-                        void NotebookActions.runAllAbove(content, context.sessionContext).then(executed => {
-                            if (executed || content.activeCellIndex === 0) {
-                                void NotebookActions.run(content, context.sessionContext);
-                            }
-                        });
-                    }
-                });
+        execute: async () => {
+            const restarted = await commands.execute(CommandIDs.restart, {
+                activate: false
+            });
+            if (restarted) {
+                const executed = await commands.execute(CommandIDs.runAllAbove, { activate: false });
+                if (executed) {
+                    return commands.execute(CommandIDs.run);
+                }
             }
         },
         isEnabled: isEnabledAndSingleSelected
     });
     commands.addCommand(CommandIDs.restartRunAll, {
         label: trans.__('Restart Kernel and Run All Cells…'),
-        execute: args => {
-            const current = getCurrent(tracker, shell, args);
-            if (current) {
-                const { context, content, sessionContext } = current;
-                return sessionDialogs
-                    .restart(sessionContext, translator)
-                    .then(restarted => {
-                    if (restarted) {
-                        void NotebookActions.runAll(content, context.sessionContext);
-                    }
-                    return restarted;
-                });
+        execute: async () => {
+            const restarted = await commands.execute(CommandIDs.restart, {
+                activate: false
+            });
+            if (restarted) {
+                await commands.execute(CommandIDs.runAll);
             }
         },
         isEnabled
     });
     commands.addCommand(CommandIDs.clearAllOutputs, {
-        label: trans.__('Clear All Outputs'),
+        label: trans.__('Clear Outputs of All Cells'),
+        caption: trans.__('Clear all outputs of all cells'),
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
@@ -1326,7 +1498,8 @@ function addCommands(app, tracker, translator, sessionDialogs) {
         isEnabled
     });
     commands.addCommand(CommandIDs.clearOutputs, {
-        label: trans.__('Clear Outputs'),
+        label: trans.__('Clear Cell Output'),
+        caption: trans.__('Clear outputs for the selected cells'),
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
@@ -1541,6 +1714,46 @@ function addCommands(app, tracker, translator, sessionDialogs) {
         },
         isEnabled
     });
+    commands.addCommand(CommandIDs.insertHeadingAbove, {
+        label: trans.__('Insert Heading Above Current Heading'),
+        execute: args => {
+            const current = getCurrent(tracker, shell, args);
+            if (current) {
+                return NotebookActions.insertSameLevelHeadingAbove(current.content);
+            }
+        },
+        isEnabled
+    });
+    commands.addCommand(CommandIDs.insertHeadingBelow, {
+        label: trans.__('Insert Heading Below Current Heading'),
+        execute: args => {
+            const current = getCurrent(tracker, shell, args);
+            if (current) {
+                return NotebookActions.insertSameLevelHeadingBelow(current.content);
+            }
+        },
+        isEnabled
+    });
+    commands.addCommand(CommandIDs.selectHeadingAboveOrCollapse, {
+        label: trans.__('Select Heading Above or Collapse Heading'),
+        execute: args => {
+            const current = getCurrent(tracker, shell, args);
+            if (current) {
+                return NotebookActions.selectHeadingAboveOrCollapseHeading(current.content);
+            }
+        },
+        isEnabled
+    });
+    commands.addCommand(CommandIDs.selectHeadingBelowOrExpand, {
+        label: trans.__('Select Heading Below or Expand Heading'),
+        execute: args => {
+            const current = getCurrent(tracker, shell, args);
+            if (current) {
+                return NotebookActions.selectHeadingBelowOrExpandHeading(current.content);
+            }
+        },
+        isEnabled
+    });
     commands.addCommand(CommandIDs.extendAbove, {
         label: trans.__('Extend Selection Above'),
         execute: args => {
@@ -1624,14 +1837,26 @@ function addCommands(app, tracker, translator, sessionDialogs) {
         icon: args => (args.toolbar ? moveDownIcon : undefined)
     });
     commands.addCommand(CommandIDs.toggleAllLines, {
-        label: trans.__('Toggle All Line Numbers'),
+        label: trans.__('Show Line Numbers'),
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
                 return NotebookActions.toggleAllLineNumbers(current.content);
             }
         },
-        isEnabled
+        isEnabled,
+        isToggled: args => {
+            const current = getCurrent(tracker, shell, Object.assign(Object.assign({}, args), { activate: false }));
+            if (current) {
+                const config = current.content.editorConfig;
+                return !!(config.code.lineNumbers &&
+                    config.markdown.lineNumbers &&
+                    config.raw.lineNumbers);
+            }
+            else {
+                return false;
+            }
+        }
     });
     commands.addCommand(CommandIDs.commandMode, {
         label: trans.__('Enter Command Mode'),
@@ -1673,6 +1898,26 @@ function addCommands(app, tracker, translator, sessionDialogs) {
         },
         isEnabled
     });
+    commands.addCommand(CommandIDs.redo, {
+        label: trans.__('Redo'),
+        execute: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, args);
+            if (current) {
+                return (_a = current.content.activeCell) === null || _a === void 0 ? void 0 : _a.editor.redo();
+            }
+        }
+    });
+    commands.addCommand(CommandIDs.undo, {
+        label: trans.__('Undo'),
+        execute: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, args);
+            if (current) {
+                return (_a = current.content.activeCell) === null || _a === void 0 ? void 0 : _a.editor.undo();
+            }
+        }
+    });
     commands.addCommand(CommandIDs.changeKernel, {
         label: trans.__('Change Kernel…'),
         execute: args => {
@@ -1683,8 +1928,19 @@ function addCommands(app, tracker, translator, sessionDialogs) {
         },
         isEnabled
     });
+    commands.addCommand(CommandIDs.getKernel, {
+        label: trans.__('Get Kernel'),
+        execute: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, Object.assign({ activate: false }, args));
+            if (current) {
+                return (_a = current.sessionContext.session) === null || _a === void 0 ? void 0 : _a.kernel;
+            }
+        },
+        isEnabled
+    });
     commands.addCommand(CommandIDs.reconnectToKernel, {
-        label: trans.__('Reconnect To Kernel'),
+        label: trans.__('Reconnect to Kernel'),
         execute: args => {
             var _a;
             const current = getCurrent(tracker, shell, args);
@@ -1917,7 +2173,7 @@ function addCommands(app, tracker, translator, sessionDialogs) {
         isEnabled
     });
     commands.addCommand(CommandIDs.toggleCollapseCmd, {
-        label: 'Toggle Collapse Notebook Heading',
+        label: trans.__('Toggle Collapse Notebook Heading'),
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
@@ -1927,16 +2183,16 @@ function addCommands(app, tracker, translator, sessionDialogs) {
         isEnabled: isEnabledAndHeadingSelected
     });
     commands.addCommand(CommandIDs.collapseAllCmd, {
-        label: 'Collapse All Cells',
+        label: trans.__('Collapse All Headings'),
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
-                return NotebookActions.collapseAll(current.content);
+                return NotebookActions.collapseAllHeadings(current.content);
             }
         }
     });
     commands.addCommand(CommandIDs.expandAllCmd, {
-        label: 'Expand All Headings',
+        label: trans.__('Expand All Headings'),
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
@@ -1944,6 +2200,33 @@ function addCommands(app, tracker, translator, sessionDialogs) {
             }
         }
     });
+    commands.addCommand(CommandIDs.tocRunCells, {
+        label: trans.__('Select and Run Cell(s) for this Heading'),
+        execute: args => {
+            const current = getCurrent(tracker, shell, Object.assign({ activate: false }, args));
+            if (current === null) {
+                return;
+            }
+            const activeCell = current.content.activeCell;
+            let lastIndex = current.content.activeCellIndex;
+            if (activeCell instanceof MarkdownCell) {
+                const cells = current.content.widgets;
+                const level = activeCell.headingInfo.level;
+                for (let i = current.content.activeCellIndex + 1; i < cells.length; i++) {
+                    const cell = cells[i];
+                    if (cell instanceof MarkdownCell &&
+                        // cell.headingInfo.level === -1 if no heading
+                        cell.headingInfo.level >= 0 &&
+                        cell.headingInfo.level <= level) {
+                        break;
+                    }
+                    lastIndex = i;
+                }
+            }
+            current.content.extendContiguousSelectionTo(lastIndex);
+            NotebookActions.run(current.content, current.sessionContext);
+        }
+    });
 }
 /**
  * Populate the application's command palette with notebook commands.
@@ -2007,6 +2290,10 @@ function populatePalette(palette, translator) {
         CommandIDs.insertBelow,
         CommandIDs.selectAbove,
         CommandIDs.selectBelow,
+        CommandIDs.selectHeadingAboveOrCollapse,
+        CommandIDs.selectHeadingBelowOrExpand,
+        CommandIDs.insertHeadingAbove,
+        CommandIDs.insertHeadingBelow,
         CommandIDs.extendAbove,
         CommandIDs.extendTop,
         CommandIDs.extendBelow,
@@ -2040,141 +2327,80 @@ function populatePalette(palette, translator) {
 /**
  * Populates the application menus for the notebook.
  */
-function populateMenus(app, mainMenu, tracker, translator, sessionDialogs) {
-    const trans = translator.load('jupyterlab');
-    const { commands } = app;
+function populateMenus(mainMenu, tracker, sessionDialogs, isEnabled) {
     sessionDialogs = sessionDialogs || sessionContextDialogs;
     // Add undo/redo hooks to the edit menu.
-    mainMenu.editMenu.undoers.add({
-        tracker,
-        undo: widget => {
-            var _a;
-            (_a = widget.content.activeCell) === null || _a === void 0 ? void 0 : _a.editor.undo();
-        },
-        redo: widget => {
-            var _a;
-            (_a = widget.content.activeCell) === null || _a === void 0 ? void 0 : _a.editor.redo();
-        }
+    mainMenu.editMenu.undoers.redo.add({
+        id: CommandIDs.redo,
+        isEnabled
+    });
+    mainMenu.editMenu.undoers.undo.add({
+        id: CommandIDs.undo,
+        isEnabled
     });
     // Add a clearer to the edit menu
-    mainMenu.editMenu.clearers.add({
-        tracker,
-        clearCurrentLabel: (n) => trans.__('Clear Output'),
-        clearAllLabel: (n) => {
-            return trans.__('Clear All Outputs');
-        },
-        clearCurrent: (current) => {
-            return NotebookActions.clearOutputs(current.content);
-        },
-        clearAll: (current) => {
-            return NotebookActions.clearAllOutputs(current.content);
-        }
+    mainMenu.editMenu.clearers.clearAll.add({
+        id: CommandIDs.clearAllOutputs,
+        isEnabled
+    });
+    mainMenu.editMenu.clearers.clearCurrent.add({
+        id: CommandIDs.clearOutputs,
+        isEnabled
+    });
+    // Add a console creator the the Kernel menu
+    mainMenu.fileMenu.consoleCreators.add({
+        id: CommandIDs.createConsole,
+        isEnabled
     });
     // Add a close and shutdown command to the file menu.
     mainMenu.fileMenu.closeAndCleaners.add({
-        tracker,
-        closeAndCleanupLabel: (n) => trans.__('Close and Shutdown Notebook'),
-        closeAndCleanup: (current) => {
-            const fileName = current.title.label;
-            return showDialog({
-                title: trans.__('Shut down the Notebook?'),
-                body: trans.__('Are you sure you want to close "%1"?', fileName),
-                buttons: [Dialog.cancelButton(), Dialog.warnButton()]
-            }).then(result => {
-                if (result.button.accept) {
-                    return current.context.sessionContext.shutdown().then(() => {
-                        current.dispose();
-                    });
-                }
-            });
-        }
+        id: CommandIDs.closeAndShutdown,
+        isEnabled
     });
     // Add a kernel user to the Kernel menu
-    mainMenu.kernelMenu.kernelUsers.add({
-        tracker,
-        interruptKernel: current => {
-            var _a;
-            const kernel = (_a = current.sessionContext.session) === null || _a === void 0 ? void 0 : _a.kernel;
-            if (kernel) {
-                return kernel.interrupt();
-            }
-            return Promise.resolve(void 0);
-        },
-        reconnectToKernel: current => {
-            var _a;
-            const kernel = (_a = current.sessionContext.session) === null || _a === void 0 ? void 0 : _a.kernel;
-            if (kernel) {
-                return kernel.reconnect();
-            }
-            return Promise.resolve(void 0);
-        },
-        restartKernelAndClearLabel: (n) => trans.__('Restart Kernel and Clear All Outputs…'),
-        restartKernel: current => sessionDialogs.restart(current.sessionContext, translator),
-        restartKernelAndClear: current => {
-            return sessionDialogs
-                .restart(current.sessionContext, translator)
-                .then(restarted => {
-                if (restarted) {
-                    NotebookActions.clearAllOutputs(current.content);
-                }
-                return restarted;
-            });
-        },
-        changeKernel: current => sessionDialogs.selectKernel(current.sessionContext, translator),
-        shutdownKernel: current => current.sessionContext.shutdown()
+    mainMenu.kernelMenu.kernelUsers.changeKernel.add({
+        id: CommandIDs.changeKernel,
+        isEnabled
     });
-    // Add a console creator the the Kernel menu
-    mainMenu.fileMenu.consoleCreators.add({
-        tracker,
-        createConsoleLabel: (n) => trans.__('New Console for Notebook'),
-        createConsole: current => Private.createConsole(commands, current, true)
+    mainMenu.kernelMenu.kernelUsers.clearWidget.add({
+        id: CommandIDs.clearAllOutputs,
+        isEnabled
+    });
+    mainMenu.kernelMenu.kernelUsers.interruptKernel.add({
+        id: CommandIDs.interrupt,
+        isEnabled
+    });
+    mainMenu.kernelMenu.kernelUsers.reconnectToKernel.add({
+        id: CommandIDs.reconnectToKernel,
+        isEnabled
+    });
+    mainMenu.kernelMenu.kernelUsers.restartKernel.add({
+        id: CommandIDs.restart,
+        isEnabled
+    });
+    mainMenu.kernelMenu.kernelUsers.shutdownKernel.add({
+        id: CommandIDs.shutdown,
+        isEnabled
     });
     // Add an IEditorViewer to the application view menu
-    mainMenu.viewMenu.editorViewers.add({
-        tracker,
-        toggleLineNumbers: widget => {
-            NotebookActions.toggleAllLineNumbers(widget.content);
-        },
-        lineNumbersToggled: widget => {
-            const config = widget.content.editorConfig;
-            return !!(config.code.lineNumbers &&
-                config.markdown.lineNumbers &&
-                config.raw.lineNumbers);
-        }
+    mainMenu.viewMenu.editorViewers.toggleLineNumbers.add({
+        id: CommandIDs.toggleAllLines,
+        isEnabled
     });
     // Add an ICodeRunner to the application run menu
-    mainMenu.runMenu.codeRunners.add({
-        tracker,
-        runLabel: (n) => trans.__('Run Selected Cells'),
-        runCaption: (n) => trans.__('Run the selected cells and advance'),
-        runAllLabel: (n) => trans.__('Run All Cells'),
-        runAllCaption: (n) => trans.__('Run the all notebook cells'),
-        restartAndRunAllLabel: (n) => trans.__('Restart Kernel and Run All Cells…'),
-        restartAndRunAllCaption: (n) => trans.__('Restart the kernel, then re-run the whole notebook'),
-        run: current => {
-            const { context, content } = current;
-            return NotebookActions.runAndAdvance(content, context.sessionContext).then(() => void 0);
-        },
-        runAll: current => {
-            const { context, content } = current;
-            return NotebookActions.runAll(content, context.sessionContext).then(() => void 0);
-        },
-        restartAndRunAll: current => {
-            const { context, content } = current;
-            return sessionDialogs
-                .restart(context.sessionContext, translator)
-                .then(restarted => {
-                if (restarted) {
-                    void NotebookActions.runAll(content, context.sessionContext);
-                }
-                return restarted;
-            });
-        }
+    mainMenu.runMenu.codeRunners.restart.add({
+        id: CommandIDs.restart,
+        isEnabled
     });
+    mainMenu.runMenu.codeRunners.run.add({
+        id: CommandIDs.runAndAdvance,
+        isEnabled
+    });
+    mainMenu.runMenu.codeRunners.runAll.add({ id: CommandIDs.runAll, isEnabled });
     // Add kernel information to the application help menu.
-    mainMenu.helpMenu.kernelUsers.add({
-        tracker,
-        getKernel: current => { var _a; return (_a = current.sessionContext.session) === null || _a === void 0 ? void 0 : _a.kernel; }
+    mainMenu.helpMenu.getKernel.add({
+        id: CommandIDs.getKernel,
+        isEnabled
     });
 }
 /**
@@ -2195,7 +2421,8 @@ var Private;
             preferredLanguage: widget.context.model.defaultKernelLanguage,
             activate: activate,
             ref: widget.id,
-            insertMode: 'split-bottom'
+            insertMode: 'split-bottom',
+            type: 'Linked Console'
         };
         return commands.execute('console:create', options);
     }