Merge pull request #9 from afshin/debugger-ui

Reorganize / refactor debugger-ui branch.

src/breakpoints/body.tsx

@@ -8,7 +8,7 @@ import { ArrayExt } from '@phosphor/algorithm';
 import { ISignal } from '@phosphor/signaling';
 
 export class Body extends ReactWidget {
-  constructor(model: Breakpoints.IModel) {
+  constructor(model: Breakpoints.Model) {
     super();
     this.model = model;
     this.addClass('jp-DebuggerBreakpoints-body');
@@ -18,14 +18,14 @@ export class Body extends ReactWidget {
     return <BreakpointsComponent model={this.model} />;
   }
 
-  readonly model: Breakpoints.IModel;
+  readonly model: Breakpoints.Model;
 }
 
-const BreakpointsComponent = ({ model }: { model: Breakpoints.IModel }) => {
+const BreakpointsComponent = ({ model }: { model: Breakpoints.Model }) => {
   const [breakpoints, setBreakpoints] = useState(model.breakpoints);
 
   model.breakpointsChanged.connect(
-    (_: Breakpoints.IModel, updates: Breakpoints.IBreakpoint[]) => {
+    (_: Breakpoints.Model, updates: Breakpoints.IBreakpoint[]) => {
       if (ArrayExt.shallowEqual(breakpoints, updates)) {
         return;
       }
@@ -51,13 +51,13 @@ const BreakpointComponent = ({
   breakpointChanged
 }: {
   breakpoint: Breakpoints.IBreakpoint;
-  breakpointChanged: ISignal<Breakpoints.IModel, Breakpoints.IBreakpoint>;
+  breakpointChanged: ISignal<Breakpoints.Model, Breakpoints.IBreakpoint>;
 }) => {
   const [active, setActive] = useState(breakpoint.active);
   breakpoint.active = active;
 
   breakpointChanged.connect(
-    (_: Breakpoints.IModel, updates: Breakpoints.IBreakpoint) => {
+    (_: Breakpoints.Model, updates: Breakpoints.IBreakpoint) => {
       setActive(updates.active);
     }
   );

src/breakpoints/index.ts

@@ -21,7 +21,7 @@ export class Breakpoints extends Panel {
       });
     }
 
-    this.model = new Breakpoints.IModel([]);
+    this.model = new Breakpoints.Model([]);
     this.addClass('jp-DebuggerBreakpoints');
     this.title.label = 'Breakpoints';
 
@@ -60,9 +60,10 @@ export class Breakpoints extends Panel {
 
   private isAllActive = true;
   readonly body: Widget;
-  readonly model: Breakpoints.IModel;
+  readonly model: Breakpoints.Model;
   service: BreakpointsService;
 }
+
 class BreakpointsHeader extends Widget {
   constructor(title: string) {
     super({ node: document.createElement('header') });
@@ -84,12 +85,7 @@ export namespace Breakpoints {
     active: boolean;
   }
 
-  /**
-   * The breakpoints UI model.
-   */
-  export interface IModel {}
-
-  export class IModel implements IModel {
+  export class Model {
     constructor(model: IBreakpoint[]) {
       this._state = model;
     }

src/breakpointsService.ts

@@ -3,11 +3,9 @@
 
 import { Breakpoints } from './breakpoints';
 import { Signal } from '@phosphor/signaling';
-import { LineInfo } from './cellManeger';
+import { LineInfo } from './handlers/cell';
 
 export class BreakpointsService {
-  constructor() {}
-
   private selectedType: SessionTypes;
   private state = {
     console: [] as Breakpoints.IBreakpoint[],
@@ -18,13 +16,13 @@ export class BreakpointsService {
     this
   );
 
-  addBreakpoint(session_id: string, type: string, lineInfo: LineInfo) {
+  addBreakpoint(session: string, type: string, lineInfo: LineInfo) {
     const breakpoint: Breakpoints.IBreakpoint = {
       line: lineInfo.line,
       active: true,
       verified: true,
       source: {
-        name: session_id
+        name: session
       }
     };
     this.selectedBreakpoints = [...this.selectedBreakpoints, breakpoint];

src/consoleTracker/index.ts → src/handlers/console.ts

@@ -10,7 +10,7 @@ import {
 import { DebugSession } from '../session';
 import { IClientSession, WidgetTracker } from '@jupyterlab/apputils';
 import { BreakpointsService } from '../breakpointsService';
-import { CellManager } from '../cellManeger';
+import { CellManager } from '../handlers/cell';
 import { CodeCell } from '@jupyterlab/cells';
 
 export class DebuggerConsoleTracker {

src/notebookTracker/index.ts → src/handlers/notebook.ts

@@ -11,7 +11,7 @@ import { DebugSession } from './../session';
 import { IClientSession } from '@jupyterlab/apputils';
 import { BreakpointsService } from '../breakpointsService';
 import { CodeCell } from '@jupyterlab/cells';
-import { CellManager } from '../cellManeger';
+import { CellManager } from './cell';
 
 export class DebuggerNotebookTracker {
   constructor(options: DebuggerNotebookTracker.IOptions) {

src/index.ts

@@ -25,10 +25,12 @@ import { Debugger } from './debugger';
 // import { DebuggerSidebar } from './sidebar';
 
 import { IDebugger, IDebuggerSidebar } from './tokens';
-import { DebuggerNotebookTracker } from './notebookTracker';
+
+import { DebuggerNotebookTracker } from './handlers/notebook';
+
 import { BreakpointsService, SessionTypes } from './breakpointsService';
 
-import { DebuggerConsoleTracker } from './consoleTracker';
+import { DebuggerConsoleTracker } from './handlers/console';
 
 // import { ClientSession, IClientSession } from '@jupyterlab/apputils';