@jupyterlab/notebook-extension 4.0.0-alpha.9 → 4.0.0-beta.0

package/lib/index.js

@@ -4,31 +4,38 @@
  * @packageDocumentation
  * @module notebook-extension
  */
-import { ILabShell, ILayoutRestorer } from '@jupyterlab/application';
-import { createToolbarFactory, Dialog, ICommandPalette, IKernelStatusModel, InputDialog, ISessionContextDialogs, IToolbarWidgetRegistry, MainAreaWidget, sessionContextDialogs, showDialog, Toolbar, WidgetTracker } from '@jupyterlab/apputils';
+import { ILabShell, ILayoutRestorer, IRouter } from '@jupyterlab/application';
+import { createToolbarFactory, Dialog, ICommandPalette, IKernelStatusModel, InputDialog, ISanitizer, ISessionContextDialogs, IToolbarWidgetRegistry, MainAreaWidget, Sanitizer, SessionContextDialogs, showDialog, Toolbar, WidgetTracker } from '@jupyterlab/apputils';
 import { MarkdownCell } from '@jupyterlab/cells';
 import { IEditorServices, IPositionModel } from '@jupyterlab/codeeditor';
 import { PageConfig } from '@jupyterlab/coreutils';
+import { IEditorExtensionRegistry, IEditorLanguageRegistry } from '@jupyterlab/codemirror';
+import { ICompletionProviderManager } from '@jupyterlab/completer';
 import { IDocumentManager } from '@jupyterlab/docmanager';
 import { ToolbarItems as DocToolbarItems } from '@jupyterlab/docmanager-extension';
-import { IFileBrowserFactory } from '@jupyterlab/filebrowser';
+import { ISearchProviderRegistry } from '@jupyterlab/documentsearch';
+import { IDefaultFileBrowser } from '@jupyterlab/filebrowser';
 import { ILauncher } from '@jupyterlab/launcher';
+import { ILSPCodeExtractorsManager, ILSPDocumentConnectionManager, ILSPFeatureManager } from '@jupyterlab/lsp';
 import { IMainMenu } from '@jupyterlab/mainmenu';
-import { CommandEditStatus, ExecutionIndicator, INotebookTools, INotebookTracker, INotebookWidgetFactory, NotebookActions, NotebookModelFactory, NotebookPanel, NotebookTools, NotebookTracker, NotebookTrustStatus, NotebookWidgetFactory, StaticNotebook, ToolbarItems } from '@jupyterlab/notebook';
+import { IMetadataFormProvider } from '@jupyterlab/metadataform';
+import { CommandEditStatus, ExecutionIndicator, INotebookTools, INotebookTracker, INotebookWidgetFactory, NotebookActions, NotebookAdapter, 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 { addAboveIcon, addBelowIcon, buildIcon, copyIcon, cutIcon, duplicateIcon, fastForwardIcon, IFormRendererRegistry, moveDownIcon, moveUpIcon, notebookIcon, pasteIcon } from '@jupyterlab/ui-components';
 import { ArrayExt } from '@lumino/algorithm';
 import { JSONExt, UUID } from '@lumino/coreutils';
 import { DisposableSet } from '@lumino/disposable';
 import { MessageLoop } from '@lumino/messaging';
 import { Panel } from '@lumino/widgets';
 import { logNotebookOutput } from './nboutput';
+import { ActiveCellTool } from './tool-widgets/activeCellToolWidget';
+import { CellMetadataField, NotebookMetadataField } from './tool-widgets/metadataEditorFields';
 /**
  * The command IDs used by the notebook plugin.
  */
@@ -123,6 +130,7 @@ var CommandIDs;
     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.
@@ -147,15 +155,18 @@ const SIDE_BY_SIDE_STYLE_ID = 'jp-NotebookExtension-sideBySideMargins';
 const trackerPlugin = {
     id: '@jupyterlab/notebook-extension:tracker',
     provides: INotebookTracker,
-    requires: [INotebookWidgetFactory, ITranslator],
+    requires: [INotebookWidgetFactory, IEditorExtensionRegistry],
     optional: [
         ICommandPalette,
-        IFileBrowserFactory,
+        IDefaultFileBrowser,
         ILauncher,
         ILayoutRestorer,
         IMainMenu,
+        IRouter,
         ISettingRegistry,
-        ISessionContextDialogs
+        ISessionContextDialogs,
+        ITranslator,
+        IFormRendererRegistry
     ],
     activate: activateNotebookHandler,
     autoStart: true
@@ -181,7 +192,13 @@ const tools = {
     provides: INotebookTools,
     id: '@jupyterlab/notebook-extension:tools',
     autoStart: true,
-    requires: [INotebookTracker, IEditorServices, IStateDB, ITranslator],
+    requires: [
+        INotebookTracker,
+        IEditorServices,
+        IEditorLanguageRegistry,
+        IStateDB,
+        ITranslator
+    ],
     optional: [IPropertyInspectorProvider]
 };
 /**
@@ -311,6 +328,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)
@@ -348,43 +368,53 @@ export const exportPlugin = {
                     ((_a = item.submenu) === null || _a === void 0 ? void 0 : _a.id) === 'jp-mainmenu-file-notebookexport';
             })) === null || _a === void 0 ? void 0 : _a.submenu;
         }
-        void services.nbconvert.getExportFormats().then(response => {
-            if (response) {
-                const formatLabels = Private.getFormatLabels(translator);
-                // Convert export list to palette and menu items.
-                const formatList = Object.keys(response);
-                formatList.forEach(function (key) {
-                    const capCaseKey = trans.__(key[0].toUpperCase() + key.substr(1));
-                    const labelStr = formatLabels[key] ? formatLabels[key] : capCaseKey;
-                    let args = {
-                        format: key,
-                        label: labelStr,
-                        isPalette: false
-                    };
-                    if (FORMAT_EXCLUDE.indexOf(key) === -1) {
-                        if (exportTo) {
-                            exportTo.addItem({
-                                command: CommandIDs.exportToFormat,
-                                args: args
-                            });
-                        }
-                        if (palette) {
-                            args = {
-                                format: key,
-                                label: labelStr,
-                                isPalette: true
-                            };
-                            const category = trans.__('Notebook Operations');
-                            palette.addItem({
-                                command: CommandIDs.exportToFormat,
-                                category,
-                                args
-                            });
-                        }
-                    }
-                });
+        let formatsInitialized = false;
+        /** Request formats only when a notebook might use them. */
+        const maybeInitializeFormats = async () => {
+            if (formatsInitialized) {
+                return;
             }
-        });
+            tracker.widgetAdded.disconnect(maybeInitializeFormats);
+            formatsInitialized = true;
+            const response = await services.nbconvert.getExportFormats(false);
+            if (!response) {
+                return;
+            }
+            const formatLabels = Private.getFormatLabels(translator);
+            // Convert export list to palette and menu items.
+            const formatList = Object.keys(response);
+            formatList.forEach(function (key) {
+                const capCaseKey = trans.__(key[0].toUpperCase() + key.substr(1));
+                const labelStr = formatLabels[key] ? formatLabels[key] : capCaseKey;
+                let args = {
+                    format: key,
+                    label: labelStr,
+                    isPalette: false
+                };
+                if (FORMAT_EXCLUDE.indexOf(key) === -1) {
+                    if (exportTo) {
+                        exportTo.addItem({
+                            command: CommandIDs.exportToFormat,
+                            args: args
+                        });
+                    }
+                    if (palette) {
+                        args = {
+                            format: key,
+                            label: labelStr,
+                            isPalette: true
+                        };
+                        const category = trans.__('Notebook Operations');
+                        palette.addItem({
+                            command: CommandIDs.exportToFormat,
+                            category,
+                            args
+                        });
+                    }
+                }
+            });
+        };
+        tracker.widgetAdded.connect(maybeInitializeFormats);
     }
 };
 /**
@@ -427,11 +457,9 @@ const widgetFactoryPlugin = {
         NotebookPanel.IContentFactory,
         IEditorServices,
         IRenderMimeRegistry,
-        ISessionContextDialogs,
-        IToolbarWidgetRegistry,
-        ITranslator
+        IToolbarWidgetRegistry
     ],
-    optional: [ISettingRegistry],
+    optional: [ISettingRegistry, ISessionContextDialogs, ITranslator],
     activate: activateWidgetFactory,
     autoStart: true
 };
@@ -488,20 +516,29 @@ const lineColStatus = {
     id: '@jupyterlab/notebook-extension:cursor-position',
     activate: (app, tracker, positionModel) => {
         let previousWidget = null;
-        const provider = (widget) => {
-            var _a, _b, _c, _d;
+        const provider = async (widget) => {
             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;
+                    const activeCell = widget.content.activeCell;
+                    editor = null;
+                    if (activeCell) {
+                        await activeCell.ready;
+                        editor = activeCell.editor;
+                    }
                     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;
+                const activeCell = widget.content.activeCell;
+                editor = null;
+                if (activeCell) {
+                    await activeCell.ready;
+                    editor = activeCell.editor;
+                }
             }
             return editor;
         };
@@ -513,10 +550,147 @@ const lineColStatus = {
 const completerPlugin = {
     id: '@jupyterlab/notebook-extension:completer',
     requires: [INotebookTracker],
-    optional: [ICompletionProviderManager],
+    optional: [ICompletionProviderManager, ITranslator, ISanitizer],
     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));
+    }
+};
+const languageServerPlugin = {
+    id: '@jupyterlab/notebook-extension:language-server',
+    requires: [
+        INotebookTracker,
+        ILSPDocumentConnectionManager,
+        ILSPFeatureManager,
+        ILSPCodeExtractorsManager
+    ],
+    activate: activateNotebookLanguageServer,
+    autoStart: true
+};
+const updateRawMimetype = {
+    id: '@jupyterlab/notebook-extension:update-raw-mimetype',
+    autoStart: true,
+    requires: [INotebookTracker, IMetadataFormProvider, ITranslator],
+    activate: (app, tracker, metadataForms, translator) => {
+        const trans = translator.load('jupyterlab');
+        let formatsInitialized = false;
+        async function maybeInitializeFormats() {
+            if (formatsInitialized) {
+                return;
+            }
+            if (!metadataForms.get('commonToolsSection')) {
+                return;
+            }
+            const properties = metadataForms
+                .get('commonToolsSection')
+                .getProperties('/raw_mimetype');
+            if (!properties) {
+                return;
+            }
+            tracker.widgetAdded.disconnect(maybeInitializeFormats);
+            formatsInitialized = true;
+            const services = app.serviceManager;
+            const response = await services.nbconvert.getExportFormats(false);
+            if (!response) {
+                return;
+            }
+            // convert exportList to palette and menu items
+            const formatList = Object.keys(response);
+            const formatLabels = Private.getFormatLabels(translator);
+            formatList.forEach(function (key) {
+                var _a;
+                const mimetypeExists = ((_a = properties.oneOf) === null || _a === void 0 ? void 0 : _a.filter(value => value.const === key).length) > 0;
+                if (!mimetypeExists) {
+                    const altOption = trans.__(key[0].toUpperCase() + key.substr(1));
+                    const option = formatLabels[key] ? formatLabels[key] : altOption;
+                    const mimeTypeValue = response[key].output_mimetype;
+                    properties.oneOf.push({
+                        const: mimeTypeValue,
+                        title: option
+                    });
+                }
+            });
+            metadataForms
+                .get('commonToolsSection')
+                .setProperties('/raw_mimetype', properties);
+        }
+        tracker.widgetAdded.connect(maybeInitializeFormats);
+    }
+};
+/**
+ * Registering metadata editor fields.
+ */
+const customMetadataEditorFields = {
+    id: '@jupyterlab/notebook-extension:metadata-editor',
+    autoStart: true,
+    requires: [INotebookTracker, IEditorServices, IFormRendererRegistry],
+    optional: [ITranslator],
+    activate: (app, tracker, editorServices, formRegistry, translator) => {
+        const editorFactory = options => editorServices.factoryService.newInlineEditor(options);
+        // Register the custom fields.
+        const cellComponent = {
+            fieldRenderer: (props) => {
+                return new CellMetadataField({
+                    editorFactory,
+                    tracker,
+                    label: 'Cell metadata',
+                    translator: translator
+                }).render(props);
+            }
+        };
+        formRegistry.addRenderer('notebook-extension:metadata-editor.cell-metadata', cellComponent);
+        const notebookComponent = {
+            fieldRenderer: (props) => {
+                return new NotebookMetadataField({
+                    editorFactory,
+                    tracker,
+                    label: 'Notebook metadata',
+                    translator: translator
+                }).render(props);
+            }
+        };
+        formRegistry.addRenderer('notebook-extension:metadata-editor.notebook-metadata', notebookComponent);
+    }
+};
+/**
+ * Registering active cell field.
+ */
+const activeCellTool = {
+    id: '@jupyterlab/notebook-extension:active-cell-tool',
+    autoStart: true,
+    requires: [INotebookTracker, IFormRendererRegistry, IEditorLanguageRegistry],
+    activate: (
+    // Register the custom field.
+    app, tracker, formRegistry, languages) => {
+        const component = {
+            fieldRenderer: (props) => {
+                return new ActiveCellTool({
+                    tracker,
+                    languages
+                }).render(props);
+            }
+        };
+        formRegistry.addRenderer('notebook-extension:active-cell-tool.renderer', component);
+    }
+};
 /**
  * Export the plugins as default.
  */
@@ -535,30 +709,22 @@ const plugins = [
     copyOutputPlugin,
     kernelStatus,
     lineColStatus,
-    completerPlugin
+    completerPlugin,
+    searchProvider,
+    tocPlugin,
+    languageServerPlugin,
+    updateRawMimetype,
+    customMetadataEditorFields,
+    activeCellTool
 ];
 export default plugins;
 /**
  * Activate the notebook tools extension.
  */
-function activateNotebookTools(app, tracker, editorServices, state, translator, inspectorProvider) {
+function activateNotebookTools(app, tracker, editorServices, languages, state, translator, inspectorProvider) {
     const trans = translator.load('jupyterlab');
     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 editorFactory = editorServices.factoryService.newInlineEditor;
-    const cellMetadataEditor = new NotebookTools.CellMetadataEditorTool({
-        editorFactory,
-        collapsed: false,
-        translator
-    });
-    const notebookMetadataEditor = new NotebookTools.NotebookMetadataEditorTool({
-        editorFactory,
-        translator
-    });
-    const services = app.serviceManager;
     // Create message hook for triggers to save to the database.
     const hook = (sender, message) => {
         switch (message.type) {
@@ -574,59 +740,9 @@ function activateNotebookTools(app, tracker, editorServices, state, translator,
         }
         return true;
     };
-    const optionsMap = {};
-    optionsMap.None = null;
-    void services.nbconvert.getExportFormats().then(response => {
-        if (response) {
-            /**
-             * The excluded Cell Inspector Raw NbConvert Formats
-             * (returned from nbconvert's export list)
-             */
-            const rawFormatExclude = [
-                'pdf',
-                'slides',
-                'script',
-                'notebook',
-                'custom'
-            ];
-            let optionValueArray = [
-                [trans.__('PDF'), 'pdf'],
-                [trans.__('Slides'), 'slides'],
-                [trans.__('Script'), 'script'],
-                [trans.__('Notebook'), 'notebook'],
-                [trans.__('Custom'), 'custom']
-            ];
-            // convert exportList to palette and menu items
-            const formatList = Object.keys(response);
-            const formatLabels = Private.getFormatLabels(translator);
-            formatList.forEach(function (key) {
-                if (rawFormatExclude.indexOf(key) === -1) {
-                    const altOption = trans.__(key[0].toUpperCase() + key.substr(1));
-                    const option = formatLabels[key] ? formatLabels[key] : altOption;
-                    const mimeTypeValue = response[key].output_mimetype;
-                    optionValueArray.push([option, mimeTypeValue]);
-                }
-            });
-            const nbConvert = NotebookTools.createNBConvertSelector(optionValueArray, translator);
-            notebookTools.addItem({ tool: nbConvert, section: 'common', rank: 3 });
-        }
-    });
     notebookTools.title.icon = buildIcon;
     notebookTools.title.caption = trans.__('Notebook Tools');
     notebookTools.id = id;
-    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: cellMetadataEditor,
-        section: 'advanced',
-        rank: 1
-    });
-    notebookTools.addItem({
-        tool: notebookMetadataEditor,
-        section: 'advanced',
-        rank: 2
-    });
     MessageLoop.installMessageHook(notebookTools, hook);
     if (inspectorProvider) {
         tracker.widgetAdded.connect((sender, panel) => {
@@ -639,18 +755,27 @@ function activateNotebookTools(app, tracker, editorServices, state, translator,
 /**
  * Activate the notebook widget factory.
  */
-function activateWidgetFactory(app, contentFactory, editorServices, rendermime, sessionContextDialogs, toolbarRegistry, translator, settingRegistry) {
+function activateWidgetFactory(app, contentFactory, editorServices, rendermime, toolbarRegistry, settingRegistry, sessionContextDialogs_, translator_) {
+    const translator = translator_ !== null && translator_ !== void 0 ? translator_ : nullTranslator;
+    const sessionContextDialogs = sessionContextDialogs_ !== null && sessionContextDialogs_ !== void 0 ? sessionContextDialogs_ : new SessionContextDialogs({ translator });
     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 => {
-        return ExecutionIndicator.createExecutionIndicatorItem(panel, translator, settingRegistry === null || settingRegistry === void 0 ? void 0 : settingRegistry.load(trackerPlugin.id));
+    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 => {
+        const loadingSettings = settingRegistry === null || settingRegistry === void 0 ? void 0 : settingRegistry.load(trackerPlugin.id);
+        const indicator = ExecutionIndicator.createExecutionIndicatorItem(panel, translator, loadingSettings);
+        void (loadingSettings === null || loadingSettings === void 0 ? void 0 : loadingSettings.then(settings => {
+            panel.disposed.connect(() => {
+                settings.dispose();
+            });
+        }));
+        return indicator;
     });
     if (settingRegistry) {
         // Create the factory
@@ -670,9 +795,8 @@ function activateWidgetFactory(app, contentFactory, editorServices, rendermime,
         editorConfig: StaticNotebook.defaultEditorConfig,
         notebookConfig: StaticNotebook.defaultNotebookConfig,
         mimeTypeService: editorServices.mimeTypeService,
-        sessionDialogs: sessionContextDialogs,
         toolbarFactory,
-        translator: translator
+        translator
     });
     app.docRegistry.addWidgetFactory(factory);
     return factory;
@@ -734,7 +858,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);
@@ -784,7 +909,7 @@ function activateCodeConsole(app, tracker, translator) {
             }
             const { context, content } = current;
             const cell = content.activeCell;
-            const metadata = cell === null || cell === void 0 ? void 0 : cell.model.metadata.toJSON();
+            const metadata = cell === null || cell === void 0 ? void 0 : cell.model.metadata;
             const path = context.path;
             // ignore action in non-code cell
             if (!cell || cell.model.type !== 'code') {
@@ -792,6 +917,9 @@ function activateCodeConsole(app, tracker, translator) {
             }
             let code;
             const editor = cell.editor;
+            if (!editor) {
+                return;
+            }
             const selection = editor.getSelection();
             const { start, end } = selection;
             const selected = start.column !== end.column || start.line !== end.line;
@@ -799,12 +927,12 @@ function activateCodeConsole(app, tracker, translator) {
                 // Get the selected code from the editor.
                 const start = editor.getOffsetAt(selection.start);
                 const end = editor.getOffsetAt(selection.end);
-                code = editor.model.value.text.substring(start, end);
+                code = editor.model.sharedModel.getSource().substring(start, end);
             }
             else {
                 // no selection, find the complete statement around the current line
                 const cursor = editor.getCursorPosition();
-                const srcLines = editor.model.value.text.split('\n');
+                const srcLines = editor.model.sharedModel.getSource().split('\n');
                 let curLine = selection.start.line;
                 while (curLine < editor.lineCount &&
                     !srcLines[curLine].replace(/\s/g, '').length) {
@@ -939,14 +1067,24 @@ function activateCopyOutput(app, translator, tracker) {
 /**
  * Activate the notebook handler extension.
  */
-function activateNotebookHandler(app, factory, translator, palette, browserFactory, launcher, restorer, mainMenu, settingRegistry, sessionDialogs) {
+function activateNotebookHandler(app, factory, extensions, palette, defaultBrowser, launcher, restorer, mainMenu, router, settingRegistry, sessionDialogs_, translator_, formRegistry) {
+    const translator = translator_ !== null && translator_ !== void 0 ? translator_ : nullTranslator;
+    const sessionDialogs = sessionDialogs_ !== null && sessionDialogs_ !== void 0 ? sessionDialogs_ : new SessionContextDialogs({ translator });
     const trans = translator.load('jupyterlab');
     const services = app.serviceManager;
     const { commands, shell } = app;
     const tracker = new NotebookTracker({ namespace: 'notebook' });
+    // Use the router to deal with hash navigation
+    function onRouted(router, location) {
+        if (location.hash && tracker.currentWidget) {
+            tracker.currentWidget.setFragment(location.hash);
+        }
+    }
+    router === null || router === void 0 ? void 0 : router.routed.connect(onRouted);
     const isEnabled = () => {
         return Private.isEnabled(shell, tracker);
     };
+    const setSideBySideOutputRatio = (sideBySideOutputRatio) => document.documentElement.style.setProperty('--jp-side-by-side-output-size', `${sideBySideOutputRatio}fr`);
     // Fetch settings if possible.
     const fetchSettings = settingRegistry
         ? settingRegistry.load(trackerPlugin.id)
@@ -957,6 +1095,38 @@ function activateNotebookHandler(app, factory, translator, palette, browserFacto
         settings.changed.connect(() => {
             updateConfig(settings);
         });
+        const updateSessionSettings = (session, changes) => {
+            const { newValue, oldValue } = changes;
+            const autoStartDefault = newValue.autoStartDefault;
+            if (typeof autoStartDefault === 'boolean' &&
+                autoStartDefault !== oldValue.autoStartDefault) {
+                // Ensure we break the cycle
+                if (autoStartDefault !==
+                    settings.get('autoStartDefaultKernel').composite)
+                    // Once the settings is changed `updateConfig` will take care
+                    // of the propagation to existing session context.
+                    settings
+                        .set('autoStartDefaultKernel', autoStartDefault)
+                        .catch(reason => {
+                        console.error(`Failed to set ${settings.id}.autoStartDefaultKernel`);
+                    });
+            }
+        };
+        const sessionContexts = new WeakSet();
+        const listenToKernelPreference = (panel) => {
+            const session = panel.context.sessionContext;
+            if (!session.isDisposed && !sessionContexts.has(session)) {
+                sessionContexts.add(session);
+                session.kernelPreferenceChanged.connect(updateSessionSettings);
+                session.disposed.connect(() => {
+                    session.kernelPreferenceChanged.disconnect(updateSessionSettings);
+                });
+            }
+        };
+        tracker.forEach(listenToKernelPreference);
+        tracker.widgetAdded.connect((tracker, panel) => {
+            listenToKernelPreference(panel);
+        });
         commands.addCommand(CommandIDs.autoClosingBrackets, {
             execute: args => {
                 var _a;
@@ -980,7 +1150,26 @@ function activateNotebookHandler(app, factory, translator, palette, browserFacto
                 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)
+            isToggled: () => ['codeCellConfig', 'markdownCellConfig', 'rawCellConfig'].some(x => {
+                var _a;
+                return ((_a = settings.get(x).composite.autoClosingBrackets) !== null && _a !== void 0 ? _a : extensions.baseConfiguration['autoClosingBrackets']) === true;
+            })
+        });
+        commands.addCommand(CommandIDs.setSideBySideRatio, {
+            label: trans.__('Set side-by-side ratio'),
+            execute: args => {
+                InputDialog.getNumber({
+                    title: trans.__('Width of the output in side-by-side mode'),
+                    value: settings.get('sideBySideOutputRatio').composite
+                })
+                    .then(result => {
+                    setSideBySideOutputRatio(result.value);
+                    if (result.value) {
+                        void settings.set('sideBySideOutputRatio', result.value);
+                    }
+                })
+                    .catch(console.error);
+            }
         });
     })
         .catch((reason) => {
@@ -988,9 +1177,18 @@ function activateNotebookHandler(app, factory, translator, palette, browserFacto
         updateTracker({
             editorConfig: factory.editorConfig,
             notebookConfig: factory.notebookConfig,
-            kernelShutdown: factory.shutdownOnClose
+            kernelShutdown: factory.shutdownOnClose,
+            autoStartDefault: factory.autoStartDefault
         });
     });
+    if (formRegistry) {
+        const CMRenderer = formRegistry.getRenderer('@jupyterlab/codemirror-extension:plugin.defaultConfig');
+        if (CMRenderer) {
+            formRegistry.addRenderer('@jupyterlab/notebook-extension:tracker.codeCellConfig', CMRenderer);
+            formRegistry.addRenderer('@jupyterlab/notebook-extension:tracker.markdownCellConfig', CMRenderer);
+            formRegistry.addRenderer('@jupyterlab/notebook-extension:tracker.rawCellConfig', CMRenderer);
+        }
+    }
     // Handle state restoration.
     if (restorer) {
         void restorer.restore(tracker, {
@@ -1002,7 +1200,8 @@ function activateNotebookHandler(app, factory, translator, palette, browserFacto
     }
     const registry = app.docRegistry;
     const modelFactory = new NotebookModelFactory({
-        disableDocumentWideUndoRedo: factory.notebookConfig.disableDocumentWideUndoRedo
+        disableDocumentWideUndoRedo: factory.notebookConfig.disableDocumentWideUndoRedo,
+        collaborative: true
     });
     registry.addModelFactory(modelFactory);
     addCommands(app, tracker, translator, sessionDialogs, isEnabled);
@@ -1038,9 +1237,18 @@ function activateNotebookHandler(app, factory, translator, palette, browserFacto
      * Update the setting values.
      */
     function updateConfig(settings) {
-        const code = Object.assign(Object.assign({}, StaticNotebook.defaultEditorConfig.code), settings.get('codeCellConfig').composite);
-        const markdown = Object.assign(Object.assign({}, StaticNotebook.defaultEditorConfig.markdown), settings.get('markdownCellConfig').composite);
-        const raw = Object.assign(Object.assign({}, StaticNotebook.defaultEditorConfig.raw), settings.get('rawCellConfig').composite);
+        const code = {
+            ...StaticNotebook.defaultEditorConfig.code,
+            ...settings.get('codeCellConfig').composite
+        };
+        const markdown = {
+            ...StaticNotebook.defaultEditorConfig.markdown,
+            ...settings.get('markdownCellConfig').composite
+        };
+        const raw = {
+            ...StaticNotebook.defaultEditorConfig.raw,
+            ...settings.get('rawCellConfig').composite
+        };
         factory.editorConfig = { code, markdown, raw };
         factory.notebookConfig = {
             showHiddenCellsButton: settings.get('showHiddenCellsButton')
@@ -1048,21 +1256,21 @@ function activateNotebookHandler(app, factory, translator, palette, browserFacto
             scrollPastEnd: settings.get('scrollPastEnd').composite,
             defaultCell: settings.get('defaultCell').composite,
             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,
+            overscanCount: settings.get('overscanCount').composite,
+            inputHistoryScope: settings.get('inputHistoryScope').composite,
             maxNumberOutputs: settings.get('maxNumberOutputs').composite,
             showEditorForReadOnlyMarkdown: settings.get('showEditorForReadOnlyMarkdown').composite,
-            disableDocumentWideUndoRedo: settings.get('experimentalDisableDocumentWideUndoRedo').composite,
+            disableDocumentWideUndoRedo: !settings.get('documentWideUndoRedo')
+                .composite,
             renderingLayout: settings.get('renderingLayout').composite,
             sideBySideLeftMarginOverride: settings.get('sideBySideLeftMarginOverride')
                 .composite,
-            sideBySideRightMarginOverride: settings.get('sideBySideRightMarginOverride').composite
+            sideBySideRightMarginOverride: settings.get('sideBySideRightMarginOverride').composite,
+            sideBySideOutputRatio: settings.get('sideBySideOutputRatio')
+                .composite,
+            windowingMode: settings.get('windowingMode').composite
         };
+        setSideBySideOutputRatio(factory.notebookConfig.sideBySideOutputRatio);
         const sideBySideMarginStyle = `.jp-mod-sideBySide.jp-Notebook .jp-Notebook-cell {
       margin-left: ${factory.notebookConfig.sideBySideLeftMarginOverride} !important;
       margin-right: ${factory.notebookConfig.sideBySideRightMarginOverride} !important;`;
@@ -1073,32 +1281,37 @@ function activateNotebookHandler(app, factory, translator, palette, browserFacto
         else {
             document.head.insertAdjacentHTML('beforeend', `<style id="${SIDE_BY_SIDE_STYLE_ID}">${sideBySideMarginStyle}}</style>`);
         }
+        factory.autoStartDefault = settings.get('autoStartDefaultKernel')
+            .composite;
         factory.shutdownOnClose = settings.get('kernelShutdown')
             .composite;
-        modelFactory.disableDocumentWideUndoRedo = settings.get('experimentalDisableDocumentWideUndoRedo').composite;
+        modelFactory.disableDocumentWideUndoRedo = !settings.get('documentWideUndoRedo').composite;
         updateTracker({
             editorConfig: factory.editorConfig,
             notebookConfig: factory.notebookConfig,
-            kernelShutdown: factory.shutdownOnClose
+            kernelShutdown: factory.shutdownOnClose,
+            autoStartDefault: factory.autoStartDefault
         });
     }
     // Add main menu notebook menu.
     if (mainMenu) {
-        populateMenus(mainMenu, tracker, sessionDialogs, isEnabled);
+        populateMenus(mainMenu, isEnabled);
     }
     // Utility function to create a new notebook.
-    const createNew = (cwd, kernelName) => {
-        return commands
-            .execute('docmanager:new-untitled', { path: cwd, type: 'notebook' })
-            .then(model => {
-            if (model != undefined) {
-                return commands.execute('docmanager:open', {
-                    path: model.path,
-                    factory: FACTORY,
-                    kernel: { name: kernelName }
-                });
-            }
+    const createNew = async (cwd, kernelId, kernelName) => {
+        const model = await commands.execute('docmanager:new-untitled', {
+            path: cwd,
+            type: 'notebook'
         });
+        if (model !== undefined) {
+            const widget = (await commands.execute('docmanager:open', {
+                path: model.path,
+                factory: FACTORY,
+                kernel: { id: kernelId, name: kernelName }
+            }));
+            widget.isUntitled = true;
+            return widget;
+        }
     };
     // Add a command for creating a new notebook.
     commands.addCommand(CommandIDs.createNew, {
@@ -1116,10 +1329,11 @@ function activateNotebookHandler(app, factory, translator, palette, browserFacto
         caption: trans.__('Create a new notebook'),
         icon: args => (args['isPalette'] ? undefined : notebookIcon),
         execute: args => {
-            const cwd = args['cwd'] ||
-                (browserFactory ? browserFactory.defaultBrowser.model.path : '');
+            var _a;
+            const cwd = args['cwd'] || ((_a = defaultBrowser === null || defaultBrowser === void 0 ? void 0 : defaultBrowser.model.path) !== null && _a !== void 0 ? _a : '');
+            const kernelId = args['kernelId'] || '';
             const kernelName = args['kernelName'] || '';
-            return createNew(cwd, kernelName);
+            return createNew(cwd, kernelId, kernelName);
         }
     });
     // Add a launcher item if the launcher is available.
@@ -1139,7 +1353,7 @@ function activateNotebookHandler(app, factory, translator, palette, browserFacto
                 for (const name in specs.kernelspecs) {
                     const rank = name === specs.default ? 0 : Infinity;
                     const spec = specs.kernelspecs[name];
-                    let kernelIconUrl = spec.resources['logo-64x64'];
+                    const kernelIconUrl = spec.resources['logo-svg'] || spec.resources['logo-64x64'];
                     disposables.add(launcher.add({
                         command: CommandIDs.createNew,
                         args: { isLauncher: true, kernelName: name },
@@ -1161,11 +1375,14 @@ function activateNotebookHandler(app, factory, translator, palette, browserFacto
 /**
  * Activate the completer service for notebook.
  */
-function activateNotebookCompleterService(app, notebooks, manager) {
+function activateNotebookCompleterService(app, notebooks, manager, translator, appSanitizer) {
     if (!manager) {
         return;
     }
+    const trans = (translator !== null && translator !== void 0 ? translator : nullTranslator).load('jupyterlab');
+    const sanitizer = appSanitizer !== null && appSanitizer !== void 0 ? appSanitizer : new Sanitizer();
     app.commands.addCommand(CommandIDs.invokeCompleter, {
+        label: trans.__('Display the completion helper.'),
         execute: args => {
             var _a;
             const panel = notebooks.currentWidget;
@@ -1175,6 +1392,7 @@ function activateNotebookCompleterService(app, notebooks, manager) {
         }
     });
     app.commands.addCommand(CommandIDs.selectCompleter, {
+        label: trans.__('Select the completion suggestion.'),
         execute: () => {
             const id = notebooks.currentWidget && notebooks.currentWidget.id;
             if (id) {
@@ -1192,25 +1410,34 @@ function activateNotebookCompleterService(app, notebooks, manager) {
         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
+            widget: notebook,
+            sanitizer: sanitizer
         };
         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);
+            // Ensure the editor will exist on the cell before adding the completer
+            cell === null || cell === void 0 ? void 0 : cell.ready.then(() => {
+                const newCompleterContext = {
+                    editor: cell.editor,
+                    session: notebook.sessionContext.session,
+                    widget: notebook,
+                    sanitizer: sanitizer
+                };
+                return 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);
+            var _a;
+            // Ensure the editor will exist on the cell before adding the completer
+            (_a = notebook.content.activeCell) === null || _a === void 0 ? void 0 : _a.ready.then(() => {
+                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
+                };
+                return manager.updateCompleter(newCompleterContext);
+            }).catch(console.error);
         });
     };
     notebooks.widgetAdded.connect(updateCompleter);
@@ -1220,6 +1447,19 @@ function activateNotebookCompleterService(app, notebooks, manager) {
         });
     });
 }
+/**
+ * Activate the language server for notebook.
+ */
+function activateNotebookLanguageServer(app, notebooks, connectionManager, featureManager, codeExtractorManager) {
+    notebooks.widgetAdded.connect(async (_, notebook) => {
+        const adapter = new NotebookAdapter(notebook, {
+            connectionManager,
+            featureManager,
+            foreignCodeExtractorsManager: codeExtractorManager
+        });
+        connectionManager.registerAdapter(notebook.context.path, adapter);
+    });
+}
 // Get the current widget and activate unless the args specify otherwise.
 function getCurrent(tracker, shell, args) {
     const widget = tracker.currentWidget;
@@ -1235,7 +1475,6 @@ function getCurrent(tracker, shell, args) {
 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 isEnabledAndSingleSelected = () => {
         return Private.isEnabledAndSingleSelected(shell, tracker);
     };
@@ -1268,46 +1507,83 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
             NotebookActions.expandParent(cell, notebook);
         });
     });
+    tracker.selectionChanged.connect(() => {
+        commands.notifyCommandChanged(CommandIDs.duplicateBelow);
+        commands.notifyCommandChanged(CommandIDs.deleteCell);
+        commands.notifyCommandChanged(CommandIDs.copy);
+        commands.notifyCommandChanged(CommandIDs.cut);
+        commands.notifyCommandChanged(CommandIDs.pasteBelow);
+        commands.notifyCommandChanged(CommandIDs.pasteAbove);
+        commands.notifyCommandChanged(CommandIDs.pasteAndReplace);
+        commands.notifyCommandChanged(CommandIDs.moveUp);
+        commands.notifyCommandChanged(CommandIDs.moveDown);
+        commands.notifyCommandChanged(CommandIDs.run);
+        commands.notifyCommandChanged(CommandIDs.runAll);
+        commands.notifyCommandChanged(CommandIDs.runAndAdvance);
+        commands.notifyCommandChanged(CommandIDs.runAndInsert);
+    });
+    tracker.activeCellChanged.connect(() => {
+        commands.notifyCommandChanged(CommandIDs.moveUp);
+        commands.notifyCommandChanged(CommandIDs.moveDown);
+    });
     commands.addCommand(CommandIDs.runAndAdvance, {
-        label: trans.__('Run Selected Cells'),
+        label: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Run Selected Cell', 'Run Selected Cells', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
+        caption: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Run this cell and advance', 'Run these %1 cells and advance', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
                 const { context, content } = current;
-                return NotebookActions.runAndAdvance(content, context.sessionContext);
+                return NotebookActions.runAndAdvance(content, context.sessionContext, sessionDialogs, translator);
             }
         },
         isEnabled
     });
     commands.addCommand(CommandIDs.run, {
-        label: trans.__("Run Selected Cells and Don't Advance"),
+        label: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Run Selected Cell and Do not Advance', 'Run Selected Cells and Do not Advance', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
                 const { context, content } = current;
-                return NotebookActions.run(content, context.sessionContext);
+                return NotebookActions.run(content, context.sessionContext, sessionDialogs, translator);
             }
         },
         isEnabled
     });
     commands.addCommand(CommandIDs.runAndInsert, {
-        label: trans.__('Run Selected Cells and Insert Below'),
+        label: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Run Selected Cell and Insert Below', 'Run Selected Cells and Insert Below', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
                 const { context, content } = current;
-                return NotebookActions.runAndInsert(content, context.sessionContext);
+                return NotebookActions.runAndInsert(content, context.sessionContext, sessionDialogs, translator);
             }
         },
         isEnabled
     });
     commands.addCommand(CommandIDs.runAll, {
         label: trans.__('Run All Cells'),
+        caption: trans.__('Run all cells'),
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
                 const { context, content } = current;
-                return NotebookActions.runAll(content, context.sessionContext);
+                return NotebookActions.runAll(content, context.sessionContext, sessionDialogs, translator);
             }
         },
         isEnabled
@@ -1318,7 +1594,7 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
             const current = getCurrent(tracker, shell, args);
             if (current) {
                 const { context, content } = current;
-                return NotebookActions.runAllAbove(content, context.sessionContext);
+                return NotebookActions.runAllAbove(content, context.sessionContext, sessionDialogs, translator);
             }
         },
         isEnabled: () => {
@@ -1334,7 +1610,7 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
             const current = getCurrent(tracker, shell, args);
             if (current) {
                 const { context, content } = current;
-                return NotebookActions.runAllBelow(content, context.sessionContext);
+                return NotebookActions.runAllBelow(content, context.sessionContext, sessionDialogs, translator);
             }
         },
         isEnabled: () => {
@@ -1350,18 +1626,19 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
-                const { context, content } = current;
-                return NotebookActions.renderAllMarkdown(content, context.sessionContext);
+                const { content } = current;
+                return NotebookActions.renderAllMarkdown(content);
             }
         },
         isEnabled
     });
     commands.addCommand(CommandIDs.restart, {
         label: trans.__('Restart Kernel…'),
+        caption: trans.__('Restart the kernel'),
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
-                return sessionDialogs.restart(current.sessionContext, translator);
+                return sessionDialogs.restart(current.sessionContext);
             }
         },
         isEnabled
@@ -1442,6 +1719,7 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
     });
     commands.addCommand(CommandIDs.restartRunAll, {
         label: trans.__('Restart Kernel and Run All Cells…'),
+        caption: trans.__('Restart the kernel and run all cells'),
         execute: async () => {
             const restarted = await commands.execute(CommandIDs.restart, {
                 activate: false
@@ -1450,7 +1728,8 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
                 await commands.execute(CommandIDs.runAll);
             }
         },
-        isEnabled
+        isEnabled,
+        icon: fastForwardIcon
     });
     commands.addCommand(CommandIDs.clearAllOutputs, {
         label: trans.__('Clear Outputs of All Cells'),
@@ -1476,6 +1755,7 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
     });
     commands.addCommand(CommandIDs.interrupt, {
         label: trans.__('Interrupt Kernel'),
+        caption: trans.__('Interrupt the kernel'),
         execute: args => {
             var _a;
             const current = getCurrent(tracker, shell, args);
@@ -1520,8 +1800,16 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
         isEnabled
     });
     commands.addCommand(CommandIDs.cut, {
-        label: trans.__('Cut Cells'),
-        caption: trans.__('Cut the selected cells'),
+        label: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Cut Cell', 'Cut Cells', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
+        caption: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Cut this cell', 'Cut these %1 cells', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
@@ -1532,20 +1820,36 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
         isEnabled
     });
     commands.addCommand(CommandIDs.copy, {
-        label: trans.__('Copy Cells'),
-        caption: trans.__('Copy the selected cells'),
+        label: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Copy Cell', 'Copy Cells', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
+        caption: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Copy this cell', 'Copy these %1 cells', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
                 return NotebookActions.copy(current.content);
             }
         },
-        icon: args => (args.toolbar ? copyIcon : ''),
+        icon: args => (args.toolbar ? copyIcon : undefined),
         isEnabled
     });
     commands.addCommand(CommandIDs.pasteBelow, {
-        label: trans.__('Paste Cells Below'),
-        caption: trans.__('Paste cells from the clipboard'),
+        label: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Paste Cell Below', 'Paste Cells Below', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
+        caption: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Paste this cell from the clipboard', 'Paste these %1 cells from the clipboard', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
@@ -1556,7 +1860,16 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
         isEnabled
     });
     commands.addCommand(CommandIDs.pasteAbove, {
-        label: trans.__('Paste Cells Above'),
+        label: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Paste Cell Above', 'Paste Cells Above', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
+        caption: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Paste this cell from the clipboard', 'Paste these %1 cells from the clipboard', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
@@ -1566,19 +1879,31 @@ 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'),
+        label: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Duplicate Cell Below', 'Duplicate Cells Below', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
+        caption: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Create a duplicate of this cell below', 'Create duplicates of %1 cells below', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
                 NotebookActions.duplicate(current.content, 'belowSelected');
             }
         },
-        icon: args => (args.toolbar ? duplicateIcon : ''),
+        icon: args => (args.toolbar ? duplicateIcon : undefined),
         isEnabled
     });
     commands.addCommand(CommandIDs.pasteAndReplace, {
-        label: trans.__('Paste Cells and Replace'),
+        label: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Paste Cell and Replace', 'Paste Cells and Replace', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
@@ -1588,7 +1913,16 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
         isEnabled
     });
     commands.addCommand(CommandIDs.deleteCell, {
-        label: trans.__('Delete Cells'),
+        label: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Delete Cell', 'Delete Cells', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
+        caption: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Delete this cell', 'Delete these %1 cells', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
@@ -1639,6 +1973,7 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
     });
     commands.addCommand(CommandIDs.insertAbove, {
         label: trans.__('Insert Cell Above'),
+        caption: trans.__('Insert a cell above'),
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
@@ -1781,25 +2116,58 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
         isEnabled
     });
     commands.addCommand(CommandIDs.moveUp, {
-        label: trans.__('Move Cells Up'),
+        label: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Move Cell Up', 'Move Cells Up', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
+        caption: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Move this cell up', 'Move these %1 cells up', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
-                return NotebookActions.moveUp(current.content);
+                NotebookActions.moveUp(current.content);
+                Private.raiseSilentNotification(trans.__('Notebook cell shifted up successfully'), current.node);
             }
         },
-        isEnabled,
+        isEnabled: args => {
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            if (!current) {
+                return false;
+            }
+            return current.content.activeCellIndex >= 1;
+        },
         icon: args => (args.toolbar ? moveUpIcon : undefined)
     });
     commands.addCommand(CommandIDs.moveDown, {
-        label: trans.__('Move Cells Down'),
+        label: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Move Cell Down', 'Move Cells Down', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
+        caption: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Move this cell down', 'Move these %1 cells down', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
-                return NotebookActions.moveDown(current.content);
+                NotebookActions.moveDown(current.content);
+                Private.raiseSilentNotification(trans.__('Notebook cell shifted down successfully'), current.node);
             }
         },
-        isEnabled,
+        isEnabled: args => {
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            if (!current || !current.content.model) {
+                return false;
+            }
+            const length = current.content.model.cells.length;
+            return current.content.activeCellIndex < length - 1;
+        },
         icon: args => (args.toolbar ? moveDownIcon : undefined)
     });
     commands.addCommand(CommandIDs.toggleAllLines, {
@@ -1812,7 +2180,7 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
         },
         isEnabled,
         isToggled: args => {
-            const current = getCurrent(tracker, shell, Object.assign(Object.assign({}, args), { activate: false }));
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
             if (current) {
                 const config = current.content.editorConfig;
                 return !!(config.code.lineNumbers &&
@@ -1870,7 +2238,11 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
             var _a;
             const current = getCurrent(tracker, shell, args);
             if (current) {
-                return (_a = current.content.activeCell) === null || _a === void 0 ? void 0 : _a.editor.redo();
+                const cell = current.content.activeCell;
+                if (cell) {
+                    cell.inputHidden = false;
+                    return (_a = cell.editor) === null || _a === void 0 ? void 0 : _a.redo();
+                }
             }
         }
     });
@@ -1880,7 +2252,11 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
             var _a;
             const current = getCurrent(tracker, shell, args);
             if (current) {
-                return (_a = current.content.activeCell) === null || _a === void 0 ? void 0 : _a.editor.undo();
+                const cell = current.content.activeCell;
+                if (cell) {
+                    cell.inputHidden = false;
+                    return (_a = cell.editor) === null || _a === void 0 ? void 0 : _a.undo();
+                }
             }
         }
     });
@@ -1889,7 +2265,7 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
-                return sessionDialogs.selectKernel(current.context.sessionContext, translator);
+                return sessionDialogs.selectKernel(current.context.sessionContext);
             }
         },
         isEnabled
@@ -1898,7 +2274,7 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
         label: trans.__('Get Kernel'),
         execute: args => {
             var _a;
-            const current = getCurrent(tracker, shell, Object.assign({ activate: false }, args));
+            const current = getCurrent(tracker, shell, { activate: false, ...args });
             if (current) {
                 return (_a = current.sessionContext.session) === null || _a === void 0 ? void 0 : _a.kernel;
             }
@@ -2063,7 +2439,7 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
         },
         isEnabled,
         isToggled: args => {
-            const current = getCurrent(tracker, shell, Object.assign(Object.assign({}, args), { activate: false }));
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
             if (current) {
                 return current.content.renderingLayout === 'side-by-side';
             }
@@ -2072,21 +2448,6 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
             }
         }
     });
-    commands.addCommand(CommandIDs.setSideBySideRatio, {
-        label: trans.__('Set side-by-side ratio'),
-        execute: args => {
-            InputDialog.getNumber({
-                title: trans.__('Width of the output in side-by-side mode'),
-                value: 1
-            })
-                .then(result => {
-                if (result.value) {
-                    document.documentElement.style.setProperty('--jp-side-by-side-output-size', `${result.value}fr`);
-                }
-            })
-                .catch(console.error);
-        }
-    });
     commands.addCommand(CommandIDs.showAllOutputs, {
         label: trans.__('Expand All Outputs'),
         execute: args => {
@@ -2139,7 +2500,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) {
@@ -2149,7 +2510,7 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
         isEnabled: isEnabledAndHeadingSelected
     });
     commands.addCommand(CommandIDs.collapseAllCmd, {
-        label: 'Collapse All Headings',
+        label: trans.__('Collapse All Headings'),
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
@@ -2158,7 +2519,7 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
         }
     });
     commands.addCommand(CommandIDs.expandAllCmd, {
-        label: 'Expand All Headings',
+        label: trans.__('Expand All Headings'),
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
@@ -2166,6 +2527,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, { 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);
+            void NotebookActions.run(current.content, current.sessionContext, sessionDialogs, translator);
+        }
+    });
 }
 /**
  * Populate the application's command palette with notebook commands.
@@ -2266,8 +2654,7 @@ function populatePalette(palette, translator) {
 /**
  * Populates the application menus for the notebook.
  */
-function populateMenus(mainMenu, tracker, sessionDialogs, isEnabled) {
-    sessionDialogs = sessionDialogs || sessionContextDialogs;
+function populateMenus(mainMenu, isEnabled) {
     // Add undo/redo hooks to the edit menu.
     mainMenu.editMenu.undoers.redo.add({
         id: CommandIDs.redo,
@@ -2360,7 +2747,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);
     }
@@ -2431,6 +2819,35 @@ var Private;
         };
     }
     Private.getFormatLabels = getFormatLabels;
+    /**
+     * Raises a silent notification that is read by screen readers
+     *
+     * FIXME: Once a notificatiom API is introduced (https://github.com/jupyterlab/jupyterlab/issues/689),
+     * this can be refactored to use the same.
+     *
+     * More discussion at https://github.com/jupyterlab/jupyterlab/pull/9031#issuecomment-773541469
+     *
+     *
+     * @param message Message to be relayed to screen readers
+     * @param notebookNode DOM node to which the notification container is attached
+     */
+    function raiseSilentNotification(message, notebookNode) {
+        const hiddenAlertContainerId = `sr-message-container-${notebookNode.id}`;
+        const hiddenAlertContainer = document.getElementById(hiddenAlertContainerId) ||
+            document.createElement('div');
+        // If the container is not available, append the newly created container
+        // to the current notebook panel and set related properties
+        if (hiddenAlertContainer.getAttribute('id') !== hiddenAlertContainerId) {
+            hiddenAlertContainer.classList.add('sr-only');
+            hiddenAlertContainer.setAttribute('id', hiddenAlertContainerId);
+            hiddenAlertContainer.setAttribute('role', 'alert');
+            hiddenAlertContainer.hidden = true;
+            notebookNode.appendChild(hiddenAlertContainer);
+        }
+        // Insert/Update alert container with the notification message
+        hiddenAlertContainer.innerText = message;
+    }
+    Private.raiseSilentNotification = raiseSilentNotification;
     /**
      * A widget hosting a cloned output area.
      */