Cleanup, remove unused tokens.

jupyterlab · Oct 19, 2018 · 3ec2fe3 · 3ec2fe3
1 parent fcf4cc8
commit 3ec2fe3
Show file tree

Hide file tree

Showing 7 changed files with 116 additions and 106 deletions.
diff --git a/packages/statusbar-extension/src/defaults/filePath.tsx b/packages/statusbar-extension/src/defaults/filePath.tsx
@@ -11,15 +11,22 @@ import {
   JupyterLab,
   ApplicationShell
 } from '@jupyterlab/application';
-import { IStatusBar, TextItem } from '@jupyterlab/statusbar';
-import { DocumentRegistry } from '@jupyterlab/docregistry';
+
 import { VDomModel, VDomRenderer } from '@jupyterlab/apputils';
+
+import { PathExt } from '@jupyterlab/coreutils';
+
+import { IDocumentManager } from '@jupyterlab/docmanager';
+
+import { DocumentRegistry } from '@jupyterlab/docregistry';
+
+import { IStatusBar, TextItem } from '@jupyterlab/statusbar';
+
 import { IDisposable } from '@phosphor/disposable';
+
 import { ISignal } from '@phosphor/signaling';
-import { Token } from '@phosphor/coreutils';
-import { PathExt } from '@jupyterlab/coreutils';
+
 import { Widget, Title } from '@phosphor/widgets';
-import { IDocumentManager } from '@jupyterlab/docmanager';
 
 namespace FilePathComponent {
   export interface IProps {
@@ -192,15 +199,9 @@ export namespace IFilePath {
   }
 }
 
-// tslint:disable-next-line:variable-name
-export const IFilePath = new Token<IFilePath>(
-  '@jupyterlab/statusbar:IFilePath'
-);
-
-export const filePathItem: JupyterLabPlugin<IFilePath> = {
-  id: '@jupyterlab/statusbar:file-path-item',
+export const filePathStatus: JupyterLabPlugin<void> = {
+  id: '@jupyterlab/statusbar:file-path-status',
   autoStart: true,
-  provides: IFilePath,
   requires: [IStatusBar, IDocumentManager],
   activate: (
     app: JupyterLab,
@@ -216,7 +217,5 @@ export const filePathItem: JupyterLabPlugin<IFilePath> = {
         return true;
       }
     });
-
-    return item;
   }
 };
diff --git a/packages/statusbar-extension/src/defaults/lineCol.tsx b/packages/statusbar-extension/src/defaults/lineCol.tsx
@@ -4,34 +4,55 @@
 /**
  * Part of Jupyterlab status bar defaults.
  */
+
 import React from 'react';
-import { TextItem } from '@jupyterlab/statusbar';
+
 import {
   JupyterLabPlugin,
   JupyterLab,
   ApplicationShell
 } from '@jupyterlab/application';
-import { INotebookTracker, NotebookPanel } from '@jupyterlab/notebook';
+
 import {
   VDomRenderer,
   VDomModel,
   ReactElementWidget
 } from '@jupyterlab/apputils';
-import { CodeEditor } from '@jupyterlab/codeeditor';
-import { IEditorTracker, FileEditor } from '@jupyterlab/fileeditor';
-import { ISignal } from '@phosphor/signaling';
+
 import { Cell, CodeCell } from '@jupyterlab/cells';
+
+import {
+  IConsoleTracker,
+  ConsolePanel,
+  CodeConsole
+} from '@jupyterlab/console';
+
+import { CodeEditor } from '@jupyterlab/codeeditor';
+
 import { IDocumentWidget } from '@jupyterlab/docregistry';
-import { IDisposable } from '@phosphor/disposable';
-import { Token } from '@phosphor/coreutils';
-import { Widget } from '@phosphor/widgets';
-import { IStatusContext } from '../contexts';
+
+import { IEditorTracker, FileEditor } from '@jupyterlab/fileeditor';
+
+import { INotebookTracker, NotebookPanel } from '@jupyterlab/notebook';
+
 import {
   IStatusBar,
   interactiveItem,
   showPopup,
-  Popup
+  Popup,
+  TextItem
 } from '@jupyterlab/statusbar';
+
+import { IDisposable } from '@phosphor/disposable';
+
+import { Message } from '@phosphor/messaging';
+
+import { ISignal } from '@phosphor/signaling';
+
+import { Widget } from '@phosphor/widgets';
+
+import { IStatusContext } from '../contexts';
+
 import {
   lineFormWrapper,
   lineFormInput,
@@ -40,13 +61,8 @@ import {
   lineFormCaption,
   lineFormButton
 } from '../style/lineForm';
+
 import { classes } from 'typestyle/lib';
-import { Message } from '@phosphor/messaging';
-import {
-  IConsoleTracker,
-  ConsolePanel,
-  CodeConsole
-} from '@jupyterlab/console';
 
 namespace LineForm {
   export interface IProps {
@@ -386,13 +402,9 @@ export namespace ILineCol {
   }
 }
 
-// tslint:disable-next-line:variable-name
-export const ILineCol = new Token<ILineCol>('@jupyterlab/statusbar:ILineCol');
-
-export const lineColItem: JupyterLabPlugin<ILineCol> = {
+export const lineColItem: JupyterLabPlugin<void> = {
   id: '@jupyterlab/statusbar:line-col-item',
   autoStart: true,
-  provides: ILineCol,
   requires: [IStatusBar, INotebookTracker, IEditorTracker, IConsoleTracker],
   activate: (
     app: JupyterLab,
@@ -417,7 +429,5 @@ export const lineColItem: JupyterLabPlugin<ILineCol> = {
         { tracker: consoleTracker }
       ])
     });
-
-    return item;
   }
 };
diff --git a/packages/statusbar-extension/src/defaults/memoryUsage.tsx b/packages/statusbar-extension/src/defaults/memoryUsage.tsx
@@ -5,15 +5,21 @@
  * Part of Jupyterlab status bar defaults.
  */
 import React from 'react';
-import { ISignal } from '@phosphor/signaling';
-import { IDisposable } from '@phosphor/disposable';
-import { Token } from '@phosphor/coreutils';
+
 import { JupyterLabPlugin, JupyterLab } from '@jupyterlab/application';
+
 import { VDomModel, VDomRenderer } from '@jupyterlab/apputils';
-import { ServerConnection } from '@jupyterlab/services';
+
 import { URLExt } from '@jupyterlab/coreutils';
+
 import { IStatusBar, TextItem } from '@jupyterlab/statusbar';
 
+import { ServerConnection } from '@jupyterlab/services';
+
+import { IDisposable } from '@phosphor/disposable';
+
+import { ISignal } from '@phosphor/signaling';
+
 class MemoryUsage extends VDomRenderer<MemoryUsage.Model>
   implements IMemoryUsage {
   constructor() {
@@ -247,15 +253,9 @@ namespace Private {
   }
 }
 
-// tslint:disable-next-line:variable-name
-export const IMemoryUsage = new Token<IMemoryUsage>(
-  '@jupyterlab/statusbar:IMemoryUsage'
-);
-
-export const memoryUsageItem: JupyterLabPlugin<IMemoryUsage> = {
+export const memoryUsageItem: JupyterLabPlugin<void> = {
   id: '@jupyterlab/statusbar:memory-usage-item',
   autoStart: true,
-  provides: IMemoryUsage,
   requires: [IStatusBar],
   activate: (app: JupyterLab, statusBar: IStatusBar) => {
     let item = new MemoryUsage();
@@ -266,7 +266,5 @@ export const memoryUsageItem: JupyterLabPlugin<IMemoryUsage> = {
       isActive: () => item.model!.metricsAvailable,
       stateChanged: item.model!.stateChanged
     });
-
-    return item;
   }
 };
diff --git a/packages/statusbar-extension/src/defaults/runningSessions.tsx b/packages/statusbar-extension/src/defaults/runningSessions.tsx
@@ -5,26 +5,34 @@
  * Part of Jupyterlab status bar defaults.
  */
 import React from 'react';
-import { IconItem } from '@jupyterlab/statusbar';
-import { TextItem } from '@jupyterlab/statusbar';
+
 import {
   JupyterLabPlugin,
   JupyterLab,
   ApplicationShell
 } from '@jupyterlab/application';
+
+import { VDomRenderer, VDomModel } from '@jupyterlab/apputils';
+
 import {
   ServiceManager,
   Kernel,
   TerminalSession,
   TerminalManager,
   SessionManager
 } from '@jupyterlab/services';
-import { VDomRenderer, VDomModel } from '@jupyterlab/apputils';
-import { ISignal } from '@phosphor/signaling';
+
+import {
+  GroupItem,
+  IconItem,
+  IStatusBar,
+  interactiveItem,
+  TextItem
+} from '@jupyterlab/statusbar';
+
 import { IDisposable } from '@phosphor/disposable';
-import { Token } from '@phosphor/coreutils';
-import { GroupItem } from '@jupyterlab/statusbar';
-import { IStatusBar, interactiveItem } from '@jupyterlab/statusbar';
+
+import { ISignal } from '@phosphor/signaling';
 
 const HALF_SPACING = 4;
 
@@ -169,18 +177,12 @@ export namespace IRunningSessions {
   }
 }
 
-// tslint:disable-next-line:variable-name
-export const IRunningSessions = new Token<IRunningSessions>(
-  '@jupyterlab/statusbar:IRunningSessions'
-);
-
 /*
  * Initialization data for the statusbar extension.
  */
-export const runningSessionsItem: JupyterLabPlugin<IRunningSessions> = {
+export const runningSessionsItem: JupyterLabPlugin<void> = {
   id: '@jupyterlab/statusbar:running-sessions-item',
   autoStart: true,
-  provides: IRunningSessions,
   requires: [IStatusBar],
   activate: (app: JupyterLab, statusBar: IStatusBar) => {
     const item = new RunningSessions({
@@ -192,7 +194,5 @@ export const runningSessionsItem: JupyterLabPlugin<IRunningSessions> = {
       align: 'left',
       rank: 0
     });
-
-    return item;
   }
 };
diff --git a/packages/statusbar-extension/src/defaults/savingStatus.tsx b/packages/statusbar-extension/src/defaults/savingStatus.tsx
@@ -5,14 +5,20 @@ import {
   JupyterLab,
   ApplicationShell
 } from '@jupyterlab/application';
-import { IStatusBar, TextItem } from '@jupyterlab/statusbar';
-import { DocumentRegistry } from '@jupyterlab/docregistry';
+
 import { VDomModel, VDomRenderer } from '@jupyterlab/apputils';
+
+import { IDocumentManager } from '@jupyterlab/docmanager';
+
+import { DocumentRegistry } from '@jupyterlab/docregistry';
+
+import { IStatusBar, TextItem } from '@jupyterlab/statusbar';
+
 import { IDisposable } from '@phosphor/disposable';
+
 import { ISignal } from '@phosphor/signaling';
-import { Token } from '@phosphor/coreutils';
+
 import { Widget } from '@phosphor/widgets';
-import { IDocumentManager } from '@jupyterlab/docmanager';
 
 namespace SavingStatusComponent {
   export interface IProps {
@@ -149,15 +155,9 @@ export namespace ISavingStatus {
   }
 }
 
-// tslint:disable-next-line:variable-name
-export const ISavingStatus = new Token<ISavingStatus>(
-  '@jupyterlab/statusbar:ISavingStatus'
-);
-
-export const savingStatusItem: JupyterLabPlugin<ISavingStatus> = {
+export const savingStatusItem: JupyterLabPlugin<void> = {
   id: '@jupyterlab/statusbar:saving-status-item',
   autoStart: true,
-  provides: ISavingStatus,
   requires: [IStatusBar, IDocumentManager],
   activate: (
     app: JupyterLab,
@@ -173,7 +173,5 @@ export const savingStatusItem: JupyterLabPlugin<ISavingStatus> = {
       },
       stateChanged: item.model!.stateChanged
     });
-
-    return item;
   }
 };