Merge pull request #6653 from jasongrout/settings-bug-icon

Remove the settings editor bug icon and always display the error inspector
jupyterlab · Jun 20, 2019 · a00ded1 · a00ded1
2 parents da8e7bd + fcbc6a2
commit a00ded1
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 74 deletions.
diff --git a/packages/settingeditor-extension/schema/plugin.json b/packages/settingeditor-extension/schema/plugin.json
@@ -2,11 +2,6 @@
   "title": "Setting Editor",
   "description": "Setting editor settings.",
   "jupyter.lab.shortcuts": [
-    {
-      "command": "settingeditor:debug",
-      "keys": ["Accel I"],
-      "selector": ".jp-SettingEditor"
-    },
     {
       "command": "settingeditor:open",
       "keys": ["Accel ,"],

diff --git a/packages/settingeditor-extension/src/index.ts b/packages/settingeditor-extension/src/index.ts
@@ -30,8 +30,6 @@ import {
  * The command IDs used by the setting editor.
  */
 namespace CommandIDs {
-  export const debug = 'settingeditor:debug';
-
   export const open = 'settingeditor:open';
 
   export const revert = 'settingeditor:revert';
@@ -85,15 +83,6 @@ function activate(
     name: widget => namespace
   });
 
-  commands.addCommand(CommandIDs.debug, {
-    execute: () => {
-      tracker.currentWidget.content.toggleDebug();
-    },
-    iconClass: 'jp-MaterialIcon jp-BugIcon',
-    label: 'Debug User Settings In Inspector',
-    isToggled: () => tracker.currentWidget.content.isDebugVisible
-  });
-
   commands.addCommand(CommandIDs.open, {
     execute: () => {
       if (tracker.currentWidget) {
@@ -107,7 +96,6 @@ function activate(
       editor = new SettingEditor({
         commands: {
           registry: commands,
-          debug: CommandIDs.debug,
           revert: CommandIDs.revert,
           save: CommandIDs.save
         },

diff --git a/packages/settingeditor/src/plugineditor.ts b/packages/settingeditor/src/plugineditor.ts
@@ -201,11 +201,6 @@ export namespace PluginEditor {
        */
       registry: CommandRegistry;
 
-      /**
-       * The debug command ID.
-       */
-      debug: string;
-
       /**
        * The revert command ID.
        */

diff --git a/packages/settingeditor/src/raweditor.ts b/packages/settingeditor/src/raweditor.ts
@@ -121,13 +121,6 @@ export class RawEditor extends SplitPanel {
     return this._commandsChanged;
   }
 
-  /**
-   * Whether the debug panel is visible.
-   */
-  get isDebugVisible(): boolean {
-    return this._inspector.isVisible;
-  }
-
   /**
    * Tests whether the settings have been modified and need saving.
    */
@@ -234,20 +227,6 @@ export class RawEditor extends SplitPanel {
       });
   }
 
-  /**
-   * Toggle the debug functionality.
-   */
-  toggleDebug(): void {
-    const inspector = this._inspector;
-
-    if (inspector.isHidden) {
-      inspector.show();
-    } else {
-      inspector.hide();
-    }
-    this._updateToolbar();
-  }
-
   /**
    * Handle `after-attach` messages.
    */
@@ -313,11 +292,7 @@ export class RawEditor extends SplitPanel {
 
     this._canRevert = revert;
     this._canSave = save;
-    this._commandsChanged.emit([
-      commands.debug,
-      commands.revert,
-      commands.save
-    ]);
+    this._commandsChanged.emit([commands.revert, commands.save]);
   }
 
   private _canRevert = false;
@@ -345,11 +320,6 @@ export namespace RawEditor {
      */
     registry: CommandRegistry;
 
-    /**
-     * The debug command ID.
-     */
-    debug: string;
-
     /**
      * The revert command ID.
      */
@@ -420,14 +390,14 @@ namespace Private {
     commands: RawEditor.ICommandBundle,
     toolbar: Toolbar<Widget>
   ): void {
-    const { debug, registry, revert, save } = commands;
+    const { registry, revert, save } = commands;
 
     toolbar.addItem('spacer', Toolbar.createSpacerItem());
 
     // Note the button order. The rationale here is that no matter what state
     // the toolbar is in, the relative location of the revert button in the
     // toolbar remains the same.
-    [revert, debug, save].forEach(name => {
+    [revert, save].forEach(name => {
       const item = new CommandToolbarButton({ commands: registry, id: name });
       toolbar.addItem(name, item);
     });

diff --git a/packages/settingeditor/src/settingeditor.tsx b/packages/settingeditor/src/settingeditor.tsx
@@ -130,13 +130,6 @@ export class SettingEditor extends Widget {
     return this._editor.raw.commandsChanged;
   }
 
-  /**
-   * Whether the debug panel is visible.
-   */
-  get isDebugVisible(): boolean {
-    return this._editor.raw.isDebugVisible;
-  }
-
   /**
    * The currently loaded settings.
    */
@@ -180,13 +173,6 @@ export class SettingEditor extends Widget {
     return this._editor.raw.save();
   }
 
-  /**
-   * Toggle the debug functionality.
-   */
-  toggleDebug(): void {
-    this._editor.raw.toggleDebug();
-  }
-
   /**
    * Handle `'after-attach'` messages.
    */
@@ -366,11 +352,6 @@ export namespace SettingEditor {
        */
       registry: CommandRegistry;
 
-      /**
-       * The debug command ID.
-       */
-      debug: string;
-
       /**
        * The revert command ID.
        */