Start moving editor view items to view menu.

packages/codemirror-extension/src/index.ts

@@ -313,9 +313,6 @@ function activateEditorCommands(app: JupyterLab, tracker: IEditorTracker, mainMe
     menu.addItem({ type: 'submenu', submenu: modeMenu });
     menu.addItem({ type: 'submenu', submenu: tabMenu });
     menu.addItem({ type: 'separator' });
-    menu.addItem({ command: 'fileeditor:toggle-line-numbers' });
-    menu.addItem({ command: 'fileeditor:toggle-line-wrap' });
-    menu.addItem({ command: 'fileeditor:toggle-match-brackets' });
     menu.addItem({ command: 'fileeditor:toggle-autoclosing-brackets' });
     menu.addItem({ type: 'submenu', submenu: keyMapMenu });
     menu.addItem({ type: 'submenu', submenu: themeMenu });

packages/fileeditor-extension/src/index.ts

@@ -393,12 +393,27 @@ function activate(app: JupyterLab, editorServices: IEditorServices, browserFacto
     });
   }
 
-  // Add new text file creation to the file menu.
   if (menu) {
+    // Add new text file creation to the file menu.
     menu.fileMenu.newMenu.addItem({ command: CommandIDs.createNew });
-  }
-
 
+    // Add editor view options.
+    menu.viewMenu.addEditorViewer<FileEditor>({
+      tracker,
+      toggleLineNumbers: widget => {
+        const lineNumbers = !widget.editor.getOption('lineNumbers');
+        widget.editor.setOption('lineNumbers', lineNumbers);
+      },
+      toggleWordWrap: widget => {
+        const wordWrap = !widget.editor.getOption('lineWrap');
+        widget.editor.setOption('lineWrap', wordWrap);
+      },
+      toggleMatchBrackets: widget => {
+        const matchBrackets = !widget.editor.getOption('matchBrackets');
+        widget.editor.setOption('matchBrackets', matchBrackets);
+      }
+    });
+  }
 
   app.contextMenu.addItem({
     command: CommandIDs.createConsole, selector: '.jp-FileEditor'

packages/mainmenu-extension/src/index.ts

@@ -155,6 +155,7 @@ function createViewMenu(app: JupyterLab, menu: ViewMenu): void {
   const commands = menu.commands;
 
   commands.addCommand(CommandIDs.lineNumbering, {
+    label: 'Line Numbers',
     isEnabled: () => {
       const viewer = menu.findEditorViewer(app.shell.currentWidget);
       return !!viewer && !!viewer.toggleLineNumbers;
@@ -170,6 +171,7 @@ function createViewMenu(app: JupyterLab, menu: ViewMenu): void {
   });
 
   commands.addCommand(CommandIDs.matchBrackets, {
+    label: 'Match Brackets',
     isEnabled: () => {
       const viewer = menu.findEditorViewer(app.shell.currentWidget);
       return !!viewer && !!viewer.toggleMatchBrackets;
@@ -185,6 +187,7 @@ function createViewMenu(app: JupyterLab, menu: ViewMenu): void {
   });
 
   commands.addCommand(CommandIDs.wordWrap, {
+    label: 'Word Wrap',
     isEnabled: () => {
       const viewer = menu.findEditorViewer(app.shell.currentWidget);
       return !!viewer && !!viewer.toggleWordWrap;