@jupyterlab/fileeditor-extension 3.4.3 → 4.0.0-alpha.11

package/lib/commands.js

@@ -1,9 +1,11 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
-import { Clipboard, sessionContextDialogs } from '@jupyterlab/apputils';
-import { CodeEditor } from '@jupyterlab/codeeditor';
+import { Clipboard, MainAreaWidget, sessionContextDialogs } from '@jupyterlab/apputils';
+import { CodeEditor, CodeViewerWidget } from '@jupyterlab/codeeditor';
 import { MarkdownCodeBlocks, PathExt } from '@jupyterlab/coreutils';
+import { nullTranslator } from '@jupyterlab/translation';
 import { consoleIcon, copyIcon, cutIcon, LabIcon, markdownIcon, pasteIcon, redoIcon, textEditorIcon, undoIcon } from '@jupyterlab/ui-components';
+import { toArray } from '@lumino/algorithm';
 const autoClosingBracketsNotebook = 'notebook:toggle-autoclosing-brackets';
 const autoClosingBracketsConsole = 'console:toggle-autoclosing-brackets';
 /**
@@ -15,13 +17,17 @@ export var CommandIDs;
     CommandIDs.createNewMarkdown = 'fileeditor:create-new-markdown-file';
     CommandIDs.changeFontSize = 'fileeditor:change-font-size';
     CommandIDs.lineNumbers = 'fileeditor:toggle-line-numbers';
+    CommandIDs.currentLineNumbers = 'fileeditor:toggle-current-line-numbers';
     CommandIDs.lineWrap = 'fileeditor:toggle-line-wrap';
+    CommandIDs.currentLineWrap = 'fileeditor:toggle-current-line-wrap';
     CommandIDs.changeTabs = 'fileeditor:change-tabs';
     CommandIDs.matchBrackets = 'fileeditor:toggle-match-brackets';
+    CommandIDs.currentMatchBrackets = 'fileeditor:toggle-current-match-brackets';
     CommandIDs.autoClosingBrackets = 'fileeditor:toggle-autoclosing-brackets';
     CommandIDs.autoClosingBracketsUniversal = 'fileeditor:toggle-autoclosing-brackets-universal';
     CommandIDs.createConsole = 'fileeditor:create-console';
     CommandIDs.replaceSelection = 'fileeditor:replace-selection';
+    CommandIDs.restartConsole = 'fileeditor:restart-console';
     CommandIDs.runCode = 'fileeditor:run-code';
     CommandIDs.runAllCode = 'fileeditor:run-all';
     CommandIDs.markdownPreview = 'fileeditor:markdown-preview';
@@ -31,6 +37,9 @@ export var CommandIDs;
     CommandIDs.copy = 'fileeditor:copy';
     CommandIDs.paste = 'fileeditor:paste';
     CommandIDs.selectAll = 'fileeditor:select-all';
+    CommandIDs.invokeCompleter = 'completer:invoke-file';
+    CommandIDs.selectCompleter = 'completer:select-file';
+    CommandIDs.openCodeViewer = 'code-viewer:open';
 })(CommandIDs || (CommandIDs = {}));
 /**
  * The name of the factory that creates editor widgets.
@@ -122,35 +131,10 @@ export var Commands;
     /**
      * Wrapper function for adding the default File Editor commands
      */
-    function addCommands(commands, settingRegistry, trans, id, isEnabled, tracker, browserFactory) {
-        // Add a command to change font size.
-        addChangeFontSizeCommand(commands, settingRegistry, trans, id);
-        addLineNumbersCommand(commands, settingRegistry, trans, id, isEnabled);
-        addWordWrapCommand(commands, settingRegistry, trans, id, isEnabled);
-        addChangeTabsCommand(commands, settingRegistry, trans, id);
-        addMatchBracketsCommand(commands, settingRegistry, trans, id, isEnabled);
-        addAutoClosingBracketsCommand(commands, settingRegistry, trans, id);
-        addReplaceSelectionCommand(commands, tracker, trans, isEnabled);
-        addCreateConsoleCommand(commands, tracker, trans, isEnabled);
-        addRunCodeCommand(commands, tracker, trans, isEnabled);
-        addRunAllCodeCommand(commands, tracker, trans, isEnabled);
-        addMarkdownPreviewCommand(commands, tracker, trans);
-        // Add a command for creating a new text file.
-        addCreateNewCommand(commands, browserFactory, trans);
-        // Add a command for creating a new Markdown file.
-        addCreateNewMarkdownCommand(commands, browserFactory, trans);
-        addUndoCommand(commands, tracker, trans, isEnabled);
-        addRedoCommand(commands, tracker, trans, isEnabled);
-        addCutCommand(commands, tracker, trans, isEnabled);
-        addCopyCommand(commands, tracker, trans, isEnabled);
-        addPasteCommand(commands, tracker, trans, isEnabled);
-        addSelectAllCommand(commands, tracker, trans, isEnabled);
-    }
-    Commands.addCommands = addCommands;
-    /**
-     * Add a command to change font size for File Editor
-     */
-    function addChangeFontSizeCommand(commands, settingRegistry, trans, id) {
+    function addCommands(commands, settingRegistry, trans, id, isEnabled, tracker, browserFactory, consoleTracker, sessionDialogs) {
+        /**
+         * Add a command to change font size for File Editor
+         */
         commands.addCommand(CommandIDs.changeFontSize, {
             execute: args => {
                 const delta = Number(args['delta']);
@@ -182,12 +166,9 @@ export var Commands;
                 }
             }
         });
-    }
-    Commands.addChangeFontSizeCommand = addChangeFontSizeCommand;
-    /**
-     * Add the Line Numbers command
-     */
-    function addLineNumbersCommand(commands, settingRegistry, trans, id, isEnabled) {
+        /**
+         * Add the Line Numbers command
+         */
         commands.addCommand(CommandIDs.lineNumbers, {
             execute: () => {
                 config.lineNumbers = !config.lineNumbers;
@@ -201,12 +182,26 @@ export var Commands;
             isToggled: () => config.lineNumbers,
             label: trans.__('Line Numbers')
         });
-    }
-    Commands.addLineNumbersCommand = addLineNumbersCommand;
-    /**
-     * Add the Word Wrap command
-     */
-    function addWordWrapCommand(commands, settingRegistry, trans, id, isEnabled) {
+        commands.addCommand(CommandIDs.currentLineNumbers, {
+            label: trans.__('Show Line Numbers'),
+            execute: () => {
+                const widget = tracker.currentWidget;
+                if (!widget) {
+                    return;
+                }
+                const lineNumbers = !widget.content.editor.getOption('lineNumbers');
+                widget.content.editor.setOption('lineNumbers', lineNumbers);
+            },
+            isEnabled,
+            isToggled: () => {
+                var _a;
+                const widget = tracker.currentWidget;
+                return (_a = widget === null || widget === void 0 ? void 0 : widget.content.editor.getOption('lineNumbers')) !== null && _a !== void 0 ? _a : false;
+            }
+        });
+        /**
+         * Add the Word Wrap command
+         */
         commands.addCommand(CommandIDs.lineWrap, {
             execute: args => {
                 config.lineWrap = args['mode'] || 'off';
@@ -223,12 +218,27 @@ export var Commands;
             },
             label: trans.__('Word Wrap')
         });
-    }
-    Commands.addWordWrapCommand = addWordWrapCommand;
-    /**
-     * Add command for changing tabs size or type in File Editor
-     */
-    function addChangeTabsCommand(commands, settingRegistry, trans, id) {
+        commands.addCommand(CommandIDs.currentLineWrap, {
+            label: trans.__('Wrap Words'),
+            execute: () => {
+                const widget = tracker.currentWidget;
+                if (!widget) {
+                    return;
+                }
+                const oldValue = widget.content.editor.getOption('lineWrap');
+                const newValue = oldValue === 'off' ? 'on' : 'off';
+                widget.content.editor.setOption('lineWrap', newValue);
+            },
+            isEnabled,
+            isToggled: () => {
+                var _a;
+                const widget = tracker.currentWidget;
+                return (_a = (widget === null || widget === void 0 ? void 0 : widget.content.editor.getOption('lineWrap')) !== 'off') !== null && _a !== void 0 ? _a : false;
+            }
+        });
+        /**
+         * Add command for changing tabs size or type in File Editor
+         */
         commands.addCommand(CommandIDs.changeTabs, {
             label: args => {
                 var _a;
@@ -254,12 +264,9 @@ export var Commands;
                 return config.insertSpaces === insertSpaces && config.tabSize === size;
             }
         });
-    }
-    Commands.addChangeTabsCommand = addChangeTabsCommand;
-    /**
-     * Add the Match Brackets command
-     */
-    function addMatchBracketsCommand(commands, settingRegistry, trans, id, isEnabled) {
+        /**
+         * Add the Match Brackets command
+         */
         commands.addCommand(CommandIDs.matchBrackets, {
             execute: () => {
                 config.matchBrackets = !config.matchBrackets;
@@ -273,12 +280,26 @@ export var Commands;
             isEnabled,
             isToggled: () => config.matchBrackets
         });
-    }
-    Commands.addMatchBracketsCommand = addMatchBracketsCommand;
-    /**
-     * Add the Auto Close Brackets for Text Editor command
-     */
-    function addAutoClosingBracketsCommand(commands, settingRegistry, trans, id) {
+        commands.addCommand(CommandIDs.currentMatchBrackets, {
+            label: trans.__('Match Brackets'),
+            execute: () => {
+                const widget = tracker.currentWidget;
+                if (!widget) {
+                    return;
+                }
+                const matchBrackets = !widget.content.editor.getOption('matchBrackets');
+                widget.content.editor.setOption('matchBrackets', matchBrackets);
+            },
+            isEnabled,
+            isToggled: () => {
+                var _a;
+                const widget = tracker.currentWidget;
+                return (_a = widget === null || widget === void 0 ? void 0 : widget.content.editor.getOption('matchBrackets')) !== null && _a !== void 0 ? _a : false;
+            }
+        });
+        /**
+         * Add the Auto Close Brackets for Text Editor command
+         */
         commands.addCommand(CommandIDs.autoClosingBrackets, {
             execute: args => {
                 var _a;
@@ -319,12 +340,9 @@ export var Commands;
                 commands.isToggled(autoClosingBracketsNotebook) ||
                 commands.isToggled(autoClosingBracketsConsole)
         });
-    }
-    Commands.addAutoClosingBracketsCommand = addAutoClosingBracketsCommand;
-    /**
-     * Add the replace selection for text editor command
-     */
-    function addReplaceSelectionCommand(commands, tracker, trans, isEnabled) {
+        /**
+         * Add the replace selection for text editor command
+         */
         commands.addCommand(CommandIDs.replaceSelection, {
             execute: args => {
                 var _a, _b;
@@ -338,12 +356,9 @@ export var Commands;
             isEnabled,
             label: trans.__('Replace Selection in Editor')
         });
-    }
-    Commands.addReplaceSelectionCommand = addReplaceSelectionCommand;
-    /**
-     * Add the Create Console for Editor command
-     */
-    function addCreateConsoleCommand(commands, tracker, trans, isEnabled) {
+        /**
+         * Add the Create Console for Editor command
+         */
         commands.addCommand(CommandIDs.createConsole, {
             execute: args => {
                 const widget = tracker.currentWidget;
@@ -356,12 +371,27 @@ export var Commands;
             icon: consoleIcon,
             label: trans.__('Create Console for Editor')
         });
-    }
-    Commands.addCreateConsoleCommand = addCreateConsoleCommand;
-    /**
-     * Add the Run Code command
-     */
-    function addRunCodeCommand(commands, tracker, trans, isEnabled) {
+        /**
+         * Restart the Console Kernel linked to the current Editor
+         */
+        commands.addCommand(CommandIDs.restartConsole, {
+            execute: async () => {
+                var _a;
+                const current = (_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.content;
+                if (!current || consoleTracker === null) {
+                    return;
+                }
+                const widget = consoleTracker.find(widget => { var _a; return ((_a = widget.sessionContext.session) === null || _a === void 0 ? void 0 : _a.path) === current.context.path; });
+                if (widget) {
+                    return (sessionDialogs || sessionContextDialogs).restart(widget.sessionContext);
+                }
+            },
+            label: trans.__('Restart Kernel'),
+            isEnabled: () => consoleTracker !== null && isEnabled()
+        });
+        /**
+         * Add the Run Code command
+         */
         commands.addCommand(CommandIDs.runCode, {
             execute: () => {
                 var _a;
@@ -416,14 +446,11 @@ export var Commands;
                 }
             },
             isEnabled,
-            label: trans.__('Run Code')
+            label: trans.__('Run Selected Code')
         });
-    }
-    Commands.addRunCodeCommand = addRunCodeCommand;
-    /**
-     * Add the Run All Code command
-     */
-    function addRunAllCodeCommand(commands, tracker, trans, isEnabled) {
+        /**
+         * Add the Run All Code command
+         */
         commands.addCommand(CommandIDs.runAllCode, {
             execute: () => {
                 var _a;
@@ -457,12 +484,9 @@ export var Commands;
             isEnabled,
             label: trans.__('Run All Code')
         });
-    }
-    Commands.addRunAllCodeCommand = addRunAllCodeCommand;
-    /**
-     * Add markdown preview command
-     */
-    function addMarkdownPreviewCommand(commands, tracker, trans) {
+        /**
+         * Add markdown preview command
+         */
         commands.addCommand(CommandIDs.markdownPreview, {
             execute: () => {
                 const widget = tracker.currentWidget;
@@ -484,12 +508,51 @@ export var Commands;
             icon: markdownIcon,
             label: trans.__('Show Markdown Preview')
         });
-    }
-    Commands.addMarkdownPreviewCommand = addMarkdownPreviewCommand;
-    /**
-     * Add undo command
-     */
-    function addUndoCommand(commands, tracker, trans, isEnabled) {
+        /**
+         * Add the New File command
+         *
+         * Defaults to Text/.txt if file type data is not specified
+         */
+        commands.addCommand(CommandIDs.createNew, {
+            label: args => {
+                var _a, _b;
+                if (args.isPalette) {
+                    return (_a = args.paletteLabel) !== null && _a !== void 0 ? _a : trans.__('New Text File');
+                }
+                return (_b = args.launcherLabel) !== null && _b !== void 0 ? _b : trans.__('Text File');
+            },
+            caption: args => { var _a; return (_a = args.caption) !== null && _a !== void 0 ? _a : trans.__('Create a new text file'); },
+            icon: args => {
+                var _a;
+                return args.isPalette
+                    ? undefined
+                    : LabIcon.resolve({
+                        icon: (_a = args.iconName) !== null && _a !== void 0 ? _a : textEditorIcon
+                    });
+            },
+            execute: args => {
+                var _a;
+                const cwd = args.cwd || browserFactory.defaultBrowser.model.path;
+                return createNew(commands, cwd, (_a = args.fileExt) !== null && _a !== void 0 ? _a : 'txt');
+            }
+        });
+        /**
+         * Add the New Markdown File command
+         */
+        commands.addCommand(CommandIDs.createNewMarkdown, {
+            label: args => args['isPalette']
+                ? trans.__('New Markdown File')
+                : trans.__('Markdown File'),
+            caption: trans.__('Create a new markdown file'),
+            icon: args => (args['isPalette'] ? undefined : markdownIcon),
+            execute: args => {
+                const cwd = args['cwd'] || browserFactory.defaultBrowser.model.path;
+                return createNew(commands, cwd, 'md');
+            }
+        });
+        /**
+         * Add undo command
+         */
         commands.addCommand(CommandIDs.undo, {
             execute: () => {
                 var _a;
@@ -515,12 +578,9 @@ export var Commands;
             icon: undoIcon.bindprops({ stylesheet: 'menuItem' }),
             label: trans.__('Undo')
         });
-    }
-    Commands.addUndoCommand = addUndoCommand;
-    /**
-     * Add redo command
-     */
-    function addRedoCommand(commands, tracker, trans, isEnabled) {
+        /**
+         * Add redo command
+         */
         commands.addCommand(CommandIDs.redo, {
             execute: () => {
                 var _a;
@@ -546,12 +606,9 @@ export var Commands;
             icon: redoIcon.bindprops({ stylesheet: 'menuItem' }),
             label: trans.__('Redo')
         });
-    }
-    Commands.addRedoCommand = addRedoCommand;
-    /**
-     * Add cut command
-     */
-    function addCutCommand(commands, tracker, trans, isEnabled) {
+        /**
+         * Add cut command
+         */
         commands.addCommand(CommandIDs.cut, {
             execute: () => {
                 var _a;
@@ -579,12 +636,9 @@ export var Commands;
             icon: cutIcon.bindprops({ stylesheet: 'menuItem' }),
             label: trans.__('Cut')
         });
-    }
-    Commands.addCutCommand = addCutCommand;
-    /**
-     * Add copy command
-     */
-    function addCopyCommand(commands, tracker, trans, isEnabled) {
+        /**
+         * Add copy command
+         */
         commands.addCommand(CommandIDs.copy, {
             execute: () => {
                 var _a;
@@ -611,12 +665,9 @@ export var Commands;
             icon: copyIcon.bindprops({ stylesheet: 'menuItem' }),
             label: trans.__('Copy')
         });
-    }
-    Commands.addCopyCommand = addCopyCommand;
-    /**
-     * Add paste command
-     */
-    function addPasteCommand(commands, tracker, trans, isEnabled) {
+        /**
+         * Add paste command
+         */
         commands.addCommand(CommandIDs.paste, {
             execute: async () => {
                 var _a;
@@ -637,12 +688,9 @@ export var Commands;
             icon: pasteIcon.bindprops({ stylesheet: 'menuItem' }),
             label: trans.__('Paste')
         });
-    }
-    Commands.addPasteCommand = addPasteCommand;
-    /**
-     * Add select all command
-     */
-    function addSelectAllCommand(commands, tracker, trans, isEnabled) {
+        /**
+         * Add select all command
+         */
         commands.addCommand(CommandIDs.selectAll, {
             execute: () => {
                 var _a;
@@ -657,7 +705,34 @@ export var Commands;
             label: trans.__('Select All')
         });
     }
-    Commands.addSelectAllCommand = addSelectAllCommand;
+    Commands.addCommands = addCommands;
+    function addCompleterCommands(commands, editorTracker, manager, translator) {
+        const trans = (translator !== null && translator !== void 0 ? translator : nullTranslator).load('jupyterlab');
+        commands.addCommand(CommandIDs.invokeCompleter, {
+            label: trans.__('Display the completion helper.'),
+            execute: () => {
+                const id = editorTracker.currentWidget && editorTracker.currentWidget.id;
+                if (id) {
+                    return manager.invoke(id);
+                }
+            }
+        });
+        commands.addCommand(CommandIDs.selectCompleter, {
+            label: trans.__('Select the completion suggestion.'),
+            execute: () => {
+                const id = editorTracker.currentWidget && editorTracker.currentWidget.id;
+                if (id) {
+                    return manager.select(id);
+                }
+            }
+        });
+        commands.addKeyBinding({
+            command: CommandIDs.selectCompleter,
+            keys: ['Enter'],
+            selector: '.jp-FileEditor .jp-mod-completer-active'
+        });
+    }
+    Commands.addCompleterCommands = addCompleterCommands;
     /**
      * Helper function to check if there is a text selection in the editor
      */
@@ -696,54 +771,6 @@ export var Commands;
             }
         });
     }
-    /**
-     * Add the New File command
-     *
-     * Defaults to Text/.txt if file type data is not specified
-     */
-    function addCreateNewCommand(commands, browserFactory, trans) {
-        commands.addCommand(CommandIDs.createNew, {
-            label: args => {
-                var _a, _b;
-                if (args.isPalette) {
-                    return (_a = args.paletteLabel) !== null && _a !== void 0 ? _a : trans.__('New Text File');
-                }
-                return (_b = args.launcherLabel) !== null && _b !== void 0 ? _b : trans.__('Text File');
-            },
-            caption: args => { var _a; return (_a = args.caption) !== null && _a !== void 0 ? _a : trans.__('Create a new text file'); },
-            icon: args => {
-                var _a;
-                return args.isPalette
-                    ? undefined
-                    : LabIcon.resolve({
-                        icon: (_a = args.iconName) !== null && _a !== void 0 ? _a : textEditorIcon
-                    });
-            },
-            execute: args => {
-                var _a;
-                const cwd = args.cwd || browserFactory.defaultBrowser.model.path;
-                return createNew(commands, cwd, (_a = args.fileExt) !== null && _a !== void 0 ? _a : 'txt');
-            }
-        });
-    }
-    Commands.addCreateNewCommand = addCreateNewCommand;
-    /**
-     * Add the New Markdown File command
-     */
-    function addCreateNewMarkdownCommand(commands, browserFactory, trans) {
-        commands.addCommand(CommandIDs.createNewMarkdown, {
-            label: args => args['isPalette']
-                ? trans.__('New Markdown File')
-                : trans.__('Markdown File'),
-            caption: trans.__('Create a new markdown file'),
-            icon: args => (args['isPalette'] ? undefined : markdownIcon),
-            execute: args => {
-                const cwd = args['cwd'] || browserFactory.defaultBrowser.model.path;
-                return createNew(commands, cwd, 'md');
-            }
-        });
-    }
-    Commands.addCreateNewMarkdownCommand = addCreateNewMarkdownCommand;
     /**
      * Wrapper function for adding the default launcher items for File Editor
      */
@@ -871,16 +898,37 @@ export var Commands;
     /**
      * Wrapper function for adding the default menu items for File Editor
      */
-    function addMenuItems(menu, commands, tracker, trans, consoleTracker, sessionDialogs) {
+    function addMenuItems(menu, tracker, consoleTracker, isEnabled) {
         // Add undo/redo hooks to the edit menu.
-        addUndoRedoToEditMenu(menu, tracker);
+        menu.editMenu.undoers.redo.add({
+            id: CommandIDs.redo,
+            isEnabled
+        });
+        menu.editMenu.undoers.undo.add({
+            id: CommandIDs.undo,
+            isEnabled
+        });
         // Add editor view options.
-        addEditorViewerToViewMenu(menu, tracker);
+        menu.viewMenu.editorViewers.toggleLineNumbers.add({
+            id: CommandIDs.currentLineNumbers,
+            isEnabled
+        });
+        menu.viewMenu.editorViewers.toggleMatchBrackets.add({
+            id: CommandIDs.currentMatchBrackets,
+            isEnabled
+        });
+        menu.viewMenu.editorViewers.toggleWordWrap.add({
+            id: CommandIDs.currentLineWrap,
+            isEnabled
+        });
         // Add a console creator the the file menu.
-        addConsoleCreatorToFileMenu(menu, commands, tracker, trans);
+        menu.fileMenu.consoleCreators.add({
+            id: CommandIDs.createConsole,
+            isEnabled
+        });
         // Add a code runner to the run menu.
         if (consoleTracker) {
-            addCodeRunnersToRunMenu(menu, commands, tracker, consoleTracker, trans, sessionDialogs);
+            addCodeRunnersToRunMenu(menu, consoleTracker);
         }
     }
     Commands.addMenuItems = addMenuItems;
@@ -898,84 +946,64 @@ export var Commands;
     }
     Commands.addKernelLanguageMenuItems = addKernelLanguageMenuItems;
     /**
-     * Add File Editor undo and redo widgets to the Edit menu
+     * Add a File Editor code runner to the Run menu
      */
-    function addUndoRedoToEditMenu(menu, tracker) {
-        menu.editMenu.undoers.add({
-            tracker,
-            undo: widget => {
-                widget.content.editor.undo();
-            },
-            redo: widget => {
-                widget.content.editor.redo();
-            }
+    function addCodeRunnersToRunMenu(menu, consoleTracker) {
+        const isEnabled = (current) => current.context &&
+            !!consoleTracker.find(widget => { var _a; return ((_a = widget.sessionContext.session) === null || _a === void 0 ? void 0 : _a.path) === current.context.path; });
+        menu.runMenu.codeRunners.restart.add({
+            id: CommandIDs.restartConsole,
+            isEnabled
         });
-    }
-    Commands.addUndoRedoToEditMenu = addUndoRedoToEditMenu;
-    /**
-     * Add a File Editor editor viewer to the View Menu
-     */
-    function addEditorViewerToViewMenu(menu, tracker) {
-        menu.viewMenu.editorViewers.add({
-            tracker,
-            toggleLineNumbers: widget => {
-                const lineNumbers = !widget.content.editor.getOption('lineNumbers');
-                widget.content.editor.setOption('lineNumbers', lineNumbers);
-            },
-            toggleWordWrap: widget => {
-                const oldValue = widget.content.editor.getOption('lineWrap');
-                const newValue = oldValue === 'off' ? 'on' : 'off';
-                widget.content.editor.setOption('lineWrap', newValue);
-            },
-            toggleMatchBrackets: widget => {
-                const matchBrackets = !widget.content.editor.getOption('matchBrackets');
-                widget.content.editor.setOption('matchBrackets', matchBrackets);
-            },
-            lineNumbersToggled: widget => widget.content.editor.getOption('lineNumbers'),
-            wordWrapToggled: widget => widget.content.editor.getOption('lineWrap') !== 'off',
-            matchBracketsToggled: widget => widget.content.editor.getOption('matchBrackets')
+        menu.runMenu.codeRunners.run.add({
+            id: CommandIDs.runCode,
+            isEnabled
         });
-    }
-    Commands.addEditorViewerToViewMenu = addEditorViewerToViewMenu;
-    /**
-     * Add a File Editor console creator to the File menu
-     */
-    function addConsoleCreatorToFileMenu(menu, commands, tracker, trans) {
-        const createConsole = getCreateConsoleFunction(commands);
-        menu.fileMenu.consoleCreators.add({
-            tracker,
-            createConsoleLabel: (n) => trans.__('Create Console for Editor'),
-            createConsole
+        menu.runMenu.codeRunners.runAll.add({
+            id: CommandIDs.runAllCode,
+            isEnabled
         });
     }
-    Commands.addConsoleCreatorToFileMenu = addConsoleCreatorToFileMenu;
-    /**
-     * Add a File Editor code runner to the Run menu
-     */
-    function addCodeRunnersToRunMenu(menu, commands, tracker, consoleTracker, trans, sessionDialogs) {
-        menu.runMenu.codeRunners.add({
-            tracker,
-            runLabel: (n) => trans.__('Run Code'),
-            runAllLabel: (n) => trans.__('Run All Code'),
-            restartAndRunAllLabel: (n) => trans.__('Restart Kernel and Run All Code'),
-            isEnabled: current => !!consoleTracker.find(widget => { var _a; return ((_a = widget.sessionContext.session) === null || _a === void 0 ? void 0 : _a.path) === current.context.path; }),
-            run: () => commands.execute(CommandIDs.runCode),
-            runAll: () => commands.execute(CommandIDs.runAllCode),
-            restartAndRunAll: current => {
-                const widget = consoleTracker.find(widget => { var _a; return ((_a = widget.sessionContext.session) === null || _a === void 0 ? void 0 : _a.path) === current.context.path; });
-                if (widget) {
-                    return (sessionDialogs || sessionContextDialogs)
-                        .restart(widget.sessionContext)
-                        .then(restarted => {
-                        if (restarted) {
-                            void commands.execute(CommandIDs.runAllCode);
-                        }
-                        return restarted;
-                    });
-                }
+    Commands.addCodeRunnersToRunMenu = addCodeRunnersToRunMenu;
+    function addOpenCodeViewerCommand(app, editorServices, tracker, trans) {
+        const openCodeViewer = async (args) => {
+            var _a;
+            const func = editorServices.factoryService.newDocumentEditor;
+            const factory = options => {
+                return func(options);
+            };
+            // Derive mimetype from extension
+            let mimetype = args.mimeType;
+            if (!mimetype && args.extension) {
+                mimetype = editorServices.mimeTypeService.getMimeTypeByFilePath(`temp.${args.extension.replace(/\\.$/, '')}`);
+            }
+            const widget = CodeViewerWidget.createCodeViewer({
+                factory,
+                content: args.content,
+                mimeType: mimetype
+            });
+            widget.title.label = args.label || trans.__('Code Viewer');
+            widget.title.caption = widget.title.label;
+            // Get the fileType based on the mimetype to determine the icon
+            const fileType = toArray(app.docRegistry.fileTypes()).find(fileType => {
+                return mimetype ? fileType.mimeTypes.includes(mimetype) : undefined;
+            });
+            widget.title.icon = (_a = fileType === null || fileType === void 0 ? void 0 : fileType.icon) !== null && _a !== void 0 ? _a : textEditorIcon;
+            if (args.widgetId) {
+                widget.id = args.widgetId;
+            }
+            const main = new MainAreaWidget({ content: widget });
+            await tracker.add(main);
+            app.shell.add(main, 'main');
+            return widget;
+        };
+        app.commands.addCommand(CommandIDs.openCodeViewer, {
+            label: trans.__('Open Code Viewer'),
+            execute: (args) => {
+                return openCodeViewer(args);
             }
         });
     }
-    Commands.addCodeRunnersToRunMenu = addCodeRunnersToRunMenu;
+    Commands.addOpenCodeViewerCommand = addOpenCodeViewerCommand;
 })(Commands || (Commands = {}));
 //# sourceMappingURL=commands.js.map