@jupyterlab/notebook-extension 4.0.0-alpha.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 { addIcon, buildIcon, copyIcon, cutIcon, notebookIcon, pasteIcon } from '@jupyterlab/ui-components';
+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';
@@ -64,6 +67,7 @@ var CommandIDs;
     CommandIDs.copy = 'notebook:copy-cell';
     CommandIDs.pasteAbove = 'notebook:paste-cell-above';
     CommandIDs.pasteBelow = 'notebook:paste-cell-below';
+    CommandIDs.duplicateBelow = 'notebook:duplicate-below';
     CommandIDs.pasteAndReplace = 'notebook:paste-and-replace-cell';
     CommandIDs.moveUp = 'notebook:move-cell-up';
     CommandIDs.moveDown = 'notebook:move-cell-down';
@@ -73,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';
@@ -104,17 +112,20 @@ var CommandIDs;
     CommandIDs.showOutput = 'notebook:show-cell-outputs';
     CommandIDs.hideAllOutputs = 'notebook:hide-all-cell-outputs';
     CommandIDs.showAllOutputs = 'notebook:show-all-cell-outputs';
-    CommandIDs.toggleRenderSideBySide = 'notebook:toggle-render-side-by-side';
+    CommandIDs.toggleRenderSideBySideCurrentNotebook = 'notebook:toggle-render-side-by-side-current';
     CommandIDs.setSideBySideRatio = 'notebook:set-side-by-side-ratio';
     CommandIDs.enableOutputScrolling = 'notebook:enable-output-scrolling';
     CommandIDs.disableOutputScrolling = 'notebook:disable-output-scrolling';
     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.
@@ -129,6 +140,10 @@ const FORMAT_EXCLUDE = ['notebook', 'python', 'custom'];
  * Setting Id storing the customized toolbar definition.
  */
 const PANEL_SETTINGS = '@jupyterlab/notebook-extension:panel';
+/**
+ * The id to use on the style tag for the side by side margins.
+ */
+const SIDE_BY_SIDE_STYLE_ID = 'jp-NotebookExtension-sideBySideMargins';
 /**
  * The notebook widget tracker provider.
  */
@@ -299,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)
@@ -446,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.
  */
@@ -466,7 +558,12 @@ const plugins = [
     logNotebookOutput,
     clonedOutputsPlugin,
     codeConsolePlugin,
-    copyOutputPlugin
+    copyOutputPlugin,
+    kernelStatus,
+    lineColStatus,
+    completerPlugin,
+    searchProvider,
+    tocPlugin
 ];
 export default plugins;
 /**
@@ -479,6 +576,7 @@ function activateNotebookTools(app, tracker, editorServices, state, 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,
@@ -548,6 +646,7 @@ function activateNotebookTools(app, tracker, editorServices, state, translator,
     notebookTools.addItem({ tool: activeCellTool, section: 'common', rank: 1 });
     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',
@@ -571,13 +670,16 @@ function activateNotebookTools(app, tracker, editorServices, state, translator,
  * Activate the notebook widget factory.
  */
 function activateWidgetFactory(app, contentFactory, editorServices, rendermime, sessionContextDialogs, toolbarRegistry, translator, settingRegistry) {
+    const preferKernelOption = PageConfig.getOption('notebookStartsKernel');
+    // If the option is not set, assume `true`
+    const preferKernelValue = preferKernelOption === '' || preferKernelOption.toLowerCase() === 'true';
     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) {
@@ -591,7 +693,7 @@ function activateWidgetFactory(app, contentFactory, editorServices, rendermime,
         fileTypes: ['notebook'],
         modelName: 'notebook',
         defaultFor: ['notebook'],
-        preferKernel: true,
+        preferKernel: preferKernelValue,
         canStartKernel: true,
         rendermime,
         contentFactory,
@@ -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);
@@ -879,48 +982,48 @@ function activateNotebookHandler(app, factory, translator, palette, browserFacto
     const fetchSettings = settingRegistry
         ? settingRegistry.load(trackerPlugin.id)
         : Promise.reject(new Error(`No setting registry for ${trackerPlugin.id}`));
-    // Handle state restoration.
-    if (restorer) {
-        fetchSettings
-            .then(settings => {
+    fetchSettings
+        .then(settings => {
+        updateConfig(settings);
+        settings.changed.connect(() => {
             updateConfig(settings);
-            settings.changed.connect(() => {
-                updateConfig(settings);
-            });
-            commands.addCommand(CommandIDs.autoClosingBrackets, {
-                execute: args => {
-                    var _a;
-                    const codeConfig = settings.get('codeCellConfig')
-                        .composite;
-                    const markdownConfig = settings.get('markdownCellConfig')
-                        .composite;
-                    const rawConfig = settings.get('rawCellConfig')
-                        .composite;
-                    const anyToggled = codeConfig.autoClosingBrackets ||
-                        markdownConfig.autoClosingBrackets ||
-                        rawConfig.autoClosingBrackets;
-                    const toggled = !!((_a = args['force']) !== null && _a !== void 0 ? _a : !anyToggled);
-                    [
-                        codeConfig.autoClosingBrackets,
-                        markdownConfig.autoClosingBrackets,
-                        rawConfig.autoClosingBrackets
-                    ] = [toggled, toggled, toggled];
-                    void settings.set('codeCellConfig', codeConfig);
-                    void settings.set('markdownCellConfig', markdownConfig);
-                    void settings.set('rawCellConfig', rawConfig);
-                },
-                label: trans.__('Auto Close Brackets for All Notebook Cell Types'),
-                isToggled: () => ['codeCellConfig', 'markdownCellConfig', 'rawCellConfig'].some(x => settings.get(x).composite.autoClosingBrackets)
-            });
-        })
-            .catch((reason) => {
-            console.warn(reason.message);
-            updateTracker({
-                editorConfig: factory.editorConfig,
-                notebookConfig: factory.notebookConfig,
-                kernelShutdown: factory.shutdownOnClose
-            });
         });
+        commands.addCommand(CommandIDs.autoClosingBrackets, {
+            execute: args => {
+                var _a;
+                const codeConfig = settings.get('codeCellConfig')
+                    .composite;
+                const markdownConfig = settings.get('markdownCellConfig')
+                    .composite;
+                const rawConfig = settings.get('rawCellConfig')
+                    .composite;
+                const anyToggled = codeConfig.autoClosingBrackets ||
+                    markdownConfig.autoClosingBrackets ||
+                    rawConfig.autoClosingBrackets;
+                const toggled = !!((_a = args['force']) !== null && _a !== void 0 ? _a : !anyToggled);
+                [
+                    codeConfig.autoClosingBrackets,
+                    markdownConfig.autoClosingBrackets,
+                    rawConfig.autoClosingBrackets
+                ] = [toggled, toggled, toggled];
+                void settings.set('codeCellConfig', codeConfig);
+                void settings.set('markdownCellConfig', markdownConfig);
+                void settings.set('rawCellConfig', rawConfig);
+            },
+            label: trans.__('Auto Close Brackets for All Notebook Cell Types'),
+            isToggled: () => ['codeCellConfig', 'markdownCellConfig', 'rawCellConfig'].some(x => settings.get(x).composite.autoClosingBrackets)
+        });
+    })
+        .catch((reason) => {
+        console.warn(reason.message);
+        updateTracker({
+            editorConfig: factory.editorConfig,
+            notebookConfig: factory.notebookConfig,
+            kernelShutdown: factory.shutdownOnClose
+        });
+    });
+    // Handle state restoration.
+    if (restorer) {
         void restorer.restore(tracker, {
             command: 'docmanager:open',
             args: panel => ({ path: panel.context.path, factory: FACTORY }),
@@ -978,19 +1081,32 @@ function activateNotebookHandler(app, factory, translator, palette, browserFacto
             recordTiming: settings.get('recordTiming').composite,
             numberCellsToRenderDirectly: settings.get('numberCellsToRenderDirectly')
                 .composite,
+            remainingTimeBeforeRescheduling: settings.get('remainingTimeBeforeRescheduling').composite,
             renderCellOnIdle: settings.get('renderCellOnIdle').composite,
             observedTopMargin: settings.get('observedTopMargin').composite,
             observedBottomMargin: settings.get('observedBottomMargin')
                 .composite,
             maxNumberOutputs: settings.get('maxNumberOutputs').composite,
-            disableDocumentWideUndoRedo: settings.get('experimentalDisableDocumentWideUndoRedo').composite
+            showEditorForReadOnlyMarkdown: settings.get('showEditorForReadOnlyMarkdown').composite,
+            disableDocumentWideUndoRedo: settings.get('experimentalDisableDocumentWideUndoRedo').composite,
+            renderingLayout: settings.get('renderingLayout').composite,
+            sideBySideLeftMarginOverride: settings.get('sideBySideLeftMarginOverride')
+                .composite,
+            sideBySideRightMarginOverride: settings.get('sideBySideRightMarginOverride').composite
         };
+        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);
+        if (sideBySideMarginTag) {
+            sideBySideMarginTag.innerText = sideBySideMarginStyle;
+        }
+        else {
+            document.head.insertAdjacentHTML('beforeend', `<style id="${SIDE_BY_SIDE_STYLE_ID}">${sideBySideMarginStyle}}</style>`);
+        }
         factory.shutdownOnClose = settings.get('kernelShutdown')
             .composite;
         modelFactory.disableDocumentWideUndoRedo = settings.get('experimentalDisableDocumentWideUndoRedo').composite;
-        Private.renderSideBySide = !settings.get('sideBySideRendering')
-            .composite;
-        commands.execute(CommandIDs.toggleRenderSideBySide);
         updateTracker({
             editorConfig: factory.editorConfig,
             notebookConfig: factory.notebookConfig,
@@ -1073,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;
@@ -1266,7 +1447,8 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
         isEnabled
     });
     commands.addCommand(CommandIDs.restartClear, {
-        label: trans.__('Restart Kernel and Clear All Outputs…'),
+        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
@@ -1305,7 +1487,8 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
         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) {
@@ -1315,7 +1498,7 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
         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);
@@ -1416,6 +1599,18 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
         },
         isEnabled
     });
+    commands.addCommand(CommandIDs.duplicateBelow, {
+        label: trans.__('Duplicate Cells Below'),
+        caption: trans.__('Copy the selected cells and paste them below the selection'),
+        execute: args => {
+            const current = getCurrent(tracker, shell, args);
+            if (current) {
+                NotebookActions.duplicate(current.content, 'belowSelected');
+            }
+        },
+        icon: args => (args.toolbar ? duplicateIcon : ''),
+        isEnabled
+    });
     commands.addCommand(CommandIDs.pasteAndReplace, {
         label: trans.__('Paste Cells and Replace'),
         execute: args => {
@@ -1484,6 +1679,7 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
                 return NotebookActions.insertAbove(current.content);
             }
         },
+        icon: args => (args.toolbar ? addAboveIcon : undefined),
         isEnabled
     });
     commands.addCommand(CommandIDs.insertBelow, {
@@ -1495,7 +1691,7 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
                 return NotebookActions.insertBelow(current.content);
             }
         },
-        icon: args => (args.toolbar ? addIcon : undefined),
+        icon: args => (args.toolbar ? addBelowIcon : undefined),
         isEnabled
     });
     commands.addCommand(CommandIDs.selectAbove, {
@@ -1518,6 +1714,46 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
         },
         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 => {
@@ -1586,7 +1822,8 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
                 return NotebookActions.moveUp(current.content);
             }
         },
-        isEnabled
+        isEnabled,
+        icon: args => (args.toolbar ? moveUpIcon : undefined)
     });
     commands.addCommand(CommandIDs.moveDown, {
         label: trans.__('Move Cells Down'),
@@ -1596,7 +1833,8 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
                 return NotebookActions.moveDown(current.content);
             }
         },
-        isEnabled
+        isEnabled,
+        icon: args => (args.toolbar ? moveDownIcon : undefined)
     });
     commands.addCommand(CommandIDs.toggleAllLines, {
         label: trans.__('Show Line Numbers'),
@@ -1846,26 +2084,27 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
         },
         isEnabled
     });
-    commands.addCommand(CommandIDs.toggleRenderSideBySide, {
-        label: trans.__('Render Side-by-side'),
+    commands.addCommand(CommandIDs.toggleRenderSideBySideCurrentNotebook, {
+        label: trans.__('Render Side-by-Side'),
         execute: args => {
-            Private.renderSideBySide = !Private.renderSideBySide;
-            tracker.forEach(widget => {
-                if (widget) {
-                    if (Private.renderSideBySide) {
-                        return NotebookActions.renderSideBySide(widget.content);
-                    }
-                    return NotebookActions.renderNotSideBySide(widget.content);
-                }
-            });
-            tracker.currentChanged.connect(() => {
-                if (Private.renderSideBySide && tracker.currentWidget) {
-                    return NotebookActions.renderSideBySide(tracker.currentWidget.content);
+            const current = getCurrent(tracker, shell, args);
+            if (current) {
+                if (current.content.renderingLayout === 'side-by-side') {
+                    return NotebookActions.renderDefault(current.content);
                 }
-            });
+                return NotebookActions.renderSideBySide(current.content);
+            }
         },
-        isToggled: () => Private.renderSideBySide,
-        isEnabled
+        isEnabled,
+        isToggled: args => {
+            const current = getCurrent(tracker, shell, Object.assign(Object.assign({}, args), { activate: false }));
+            if (current) {
+                return current.content.renderingLayout === 'side-by-side';
+            }
+            else {
+                return false;
+            }
+        }
     });
     commands.addCommand(CommandIDs.setSideBySideRatio, {
         label: trans.__('Set side-by-side ratio'),
@@ -1934,7 +2173,7 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
         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) {
@@ -1944,16 +2183,16 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
         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) {
@@ -1961,6 +2200,33 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
             }
         }
     });
+    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.
@@ -2024,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,
@@ -2046,7 +2316,7 @@ function populatePalette(palette, translator) {
         CommandIDs.showOutput,
         CommandIDs.hideAllOutputs,
         CommandIDs.showAllOutputs,
-        CommandIDs.toggleRenderSideBySide,
+        CommandIDs.toggleRenderSideBySideCurrentNotebook,
         CommandIDs.setSideBySideRatio,
         CommandIDs.enableOutputScrolling,
         CommandIDs.disableOutputScrolling
@@ -2151,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);
     }
@@ -2270,6 +2541,5 @@ var Private;
         }
     }
     Private.ClonedOutputArea = ClonedOutputArea;
-    Private.renderSideBySide = false;
 })(Private || (Private = {}));
 //# sourceMappingURL=index.js.map