@jupyterlab/notebook-extension 4.0.0-alpha.19 → 4.0.0-alpha.20

package/lib/index.js

@@ -9,6 +9,8 @@ import { createToolbarFactory, Dialog, ICommandPalette, IKernelStatusModel, Inpu
 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 { ISearchProviderRegistry } from '@jupyterlab/documentsearch';
@@ -24,8 +26,7 @@ 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, fastForwardIcon, 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';
@@ -151,7 +152,7 @@ const SIDE_BY_SIDE_STYLE_ID = 'jp-NotebookExtension-sideBySideMargins';
 const trackerPlugin = {
     id: '@jupyterlab/notebook-extension:tracker',
     provides: INotebookTracker,
-    requires: [INotebookWidgetFactory],
+    requires: [INotebookWidgetFactory, IEditorExtensionRegistry],
     optional: [
         ICommandPalette,
         IDefaultFileBrowser,
@@ -161,7 +162,8 @@ const trackerPlugin = {
         IRouter,
         ISettingRegistry,
         ISessionContextDialogs,
-        ITranslator
+        ITranslator,
+        IFormRendererRegistry
     ],
     activate: activateNotebookHandler,
     autoStart: true
@@ -187,7 +189,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]
 };
 /**
@@ -357,43 +365,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);
     }
 };
 /**
@@ -593,15 +611,15 @@ 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 activeCellTool = new NotebookTools.ActiveCellTool(languages);
     const editable = NotebookTools.createEditableToggle(translator);
     const slideShow = NotebookTools.createSlideShowSelector(translator);
     const tocBaseNumbering = NotebookTools.createToCBaseNumbering(translator);
-    const editorFactory = editorServices.factoryService.newInlineEditor;
+    const editorFactory = options => editorServices.factoryService.newInlineEditor(options);
     const cellMetadataEditor = new NotebookTools.CellMetadataEditorTool({
         editorFactory,
         collapsed: false,
@@ -629,41 +647,44 @@ function activateNotebookTools(app, tracker, editorServices, state, translator,
     };
     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 });
+    let formatsInitialized = false;
+    async function maybeInitializeFormats() {
+        if (formatsInitialized) {
+            return;
         }
-    });
+        tracker.widgetAdded.disconnect(maybeInitializeFormats);
+        formatsInitialized = true;
+        const response = await services.nbconvert.getExportFormats(false);
+        if (!response) {
+            return;
+        }
+        /**
+         * 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 });
+    }
+    tracker.widgetAdded.connect(maybeInitializeFormats);
     notebookTools.title.icon = buildIcon;
     notebookTools.title.caption = trans.__('Notebook Tools');
     notebookTools.id = id;
@@ -1004,7 +1025,7 @@ function activateCopyOutput(app, translator, tracker) {
 /**
  * Activate the notebook handler extension.
  */
-function activateNotebookHandler(app, factory, palette, defaultBrowser, launcher, restorer, mainMenu, router, settingRegistry, sessionDialogs, translator) {
+function activateNotebookHandler(app, factory, extensions, palette, defaultBrowser, launcher, restorer, mainMenu, router, settingRegistry, sessionDialogs, translator, formRegistry) {
     translator = translator !== null && translator !== void 0 ? translator : nullTranslator;
     const trans = translator.load('jupyterlab');
     const services = app.serviceManager;
@@ -1054,7 +1075,10 @@ function activateNotebookHandler(app, factory, palette, defaultBrowser, launcher
                 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'),
@@ -1081,6 +1105,14 @@ function activateNotebookHandler(app, factory, palette, defaultBrowser, launcher
             kernelShutdown: factory.shutdownOnClose
         });
     });
+    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, {