Merge branch 'session' into debugger-ui

src/breakpointsService.ts

@@ -3,7 +3,7 @@
 
 import { Breakpoints } from './breakpoints';
 import { Signal } from '@phosphor/signaling';
-import { LineInfo } from './notebookTracker';
+import { LineInfo } from './cellManeger';
 
 export class BreakpointsService {
   constructor() {}
@@ -62,20 +62,37 @@ export class BreakpointsService {
     this.selectedBreakpointsChanged.emit([]);
   }
 
-  changeLines(lineInfo: LineInfo, sign: number) {
-    // need better way, maybe just look to gutter in editor?
-    const breakpoints = this.selectedBreakpoints.map(ele => {
-      if (
-        ele.line > lineInfo.line ||
-        (lineInfo.text === '' && lineInfo.line === ele.line)
-      ) {
-        ele.line = ele.line + sign;
-      }
-      if (ele.line > 0) {
-        return ele;
-      }
-    });
-    this.selectedBreakpoints = [...breakpoints];
-    this.selectedBreakpointsChanged.emit(this.selectedBreakpoints);
+  changeLines(linesInfo: LineInfo[]) {
+    if (!linesInfo && this.breakpoints.length === 0) {
+      return;
+    }
+    if (linesInfo.length === 0) {
+      this.selectedBreakpoints = [];
+      this.selectedBreakpointsChanged.emit([]);
+    } else {
+      const breakpoint = { ...this.breakpoints[0] };
+      var breakpoints: Breakpoints.IBreakpoint[] = [];
+      linesInfo.forEach(ele => {
+        breakpoints.push({ ...breakpoint, line: ele.line });
+      });
+      this.selectedBreakpoints = [...breakpoints];
+      this.selectedBreakpointsChanged.emit(this.selectedBreakpoints);
+    }
   }
 }
+
+// changeLines(lineInfo: LineInfo, sign: number) {
+//   const breakpoints = this.selectedBreakpoints.map(ele => {
+//     if (
+//       ele.line > lineInfo.line ||
+//       (lineInfo.text === '' && lineInfo.line === ele.line)
+//     ) {
+//       ele.line = ele.line + sign;
+//     }
+//     if (ele.line > 0) {
+//       return ele;
+//     }
+//   });
+//   this.selectedBreakpoints = [...breakpoints];
+//   this.selectedBreakpointsChanged.emit(this.selectedBreakpoints);
+// }

src/cellManeger/index.ts

@@ -0,0 +1,173 @@
+// Copyright (c) Jupyter Development Team.
+// Distributed under the terms of the Modified BSD License.
+
+import { CodeCell } from '@jupyterlab/cells';
+import { CodeMirrorEditor } from '@jupyterlab/codemirror';
+import { Editor, Doc } from 'codemirror';
+import { BreakpointsService } from '../breakpointsService';
+
+export class CellManager {
+  constructor(options: CellManager.IOptions) {
+    this.breakpointService = options.breakpointService;
+    this.activeCell = options.activeCell;
+    this.debuggerSessionId = options.sessionId;
+    this.onActiveCellChanged();
+  }
+
+  previousCell: CodeCell;
+  previousLineCount: number;
+  private _debuggerSessionId: string;
+  breakpointService: BreakpointsService;
+  private _activeCell: CodeCell;
+
+  set debuggerSessionId(id: string) {
+    this._debuggerSessionId = id;
+  }
+
+  get debuggerSessionId() {
+    return this._debuggerSessionId;
+  }
+
+  set activeCell(cell: CodeCell) {
+    this._activeCell = cell;
+  }
+
+  get activeCell(): CodeCell {
+    return this._activeCell;
+  }
+
+  protected clearGutter(cell: CodeCell) {
+    const editor = cell.editor as CodeMirrorEditor;
+    editor.doc.eachLine(line => {
+      if ((line as LineInfo).gutterMarkers) {
+        editor.editor.setGutterMarker(line, 'breakpoints', null);
+      }
+    });
+  }
+
+  onActiveCellChanged() {
+    // this run before change note, consider how to resolve this
+    if (this.activeCell && this.activeCell.editor && this.debuggerSessionId) {
+      this.breakpointService.onSelectedBreakpoints(
+        this.debuggerSessionId,
+        this.getEditorId()
+      );
+      if (this.previousCell && !this.previousCell.isDisposed) {
+        this.removeListner(this.previousCell);
+        this.clearGutter(this.previousCell);
+        this.breakpointService.clearSelectedBreakpoints();
+      }
+      this.previousCell = this.activeCell;
+      this.setEditor(this.activeCell);
+    }
+  }
+
+  protected setEditor(cell: CodeCell) {
+    if (!cell || !cell.editor) {
+      return;
+    }
+
+    const editor = cell.editor as CodeMirrorEditor;
+
+    this.previousLineCount = editor.lineCount;
+
+    editor.setOption('lineNumbers', true);
+    editor.editor.setOption('gutters', [
+      'CodeMirror-linenumbers',
+      'breakpoints'
+    ]);
+
+    editor.editor.on('gutterClick', this.onGutterClick);
+    editor.editor.on('renderLine', this.onNewRenderLine);
+  }
+
+  protected removeListner(cell: CodeCell) {
+    const editor = cell.editor as CodeMirrorEditor;
+    editor.setOption('lineNumbers', false);
+    editor.editor.off('gutterClick', this.onGutterClick);
+    editor.editor.off('renderLine', this.onNewRenderLine);
+  }
+
+  protected getCell(): CodeCell {
+    return this.activeCell as CodeCell;
+  }
+
+  protected getEditorId(): string {
+    return this.getCell().editor.uuid;
+  }
+
+  protected onGutterClick = (editor: Editor, lineNumber: number) => {
+    const info = editor.lineInfo(lineNumber);
+    if (!info) {
+      return;
+    }
+
+    const isRemoveGutter = !!info.gutterMarkers;
+    if (isRemoveGutter) {
+      this.breakpointService.removeBreakpoint(
+        this.debuggerSessionId,
+        this.getEditorId,
+        info as LineInfo
+      );
+    } else {
+      this.breakpointService.addBreakpoint(
+        this.debuggerSessionId,
+        this.getEditorId(),
+        info as LineInfo
+      );
+    }
+
+    editor.setGutterMarker(
+      lineNumber,
+      'breakpoints',
+      isRemoveGutter ? null : this.createMarkerNode()
+    );
+  };
+
+  protected onNewRenderLine = (editor: Editor, line: any) => {
+    const lineInfo = editor.lineInfo(line);
+    if (lineInfo.handle && lineInfo.handle.order === false) {
+      return;
+    }
+    const doc: Doc = editor.getDoc();
+    const linesNumber = doc.lineCount();
+    if (this.previousLineCount !== linesNumber) {
+      var lines: LineInfo[] = [];
+      doc.eachLine(line => {
+        if ((line as LineInfo).gutterMarkers) {
+          lines.push(editor.lineInfo(line));
+        }
+      });
+      this.breakpointService.changeLines(lines);
+      this.previousLineCount = linesNumber;
+    }
+  };
+
+  private createMarkerNode() {
+    var marker = document.createElement('div');
+    marker.className = 'jp-breakpoint-marker';
+    marker.innerHTML = '●';
+    return marker;
+  }
+}
+
+export namespace CellManager {
+  export interface IOptions {
+    sessionId: string;
+    breakpointService: BreakpointsService;
+    activeCell?: CodeCell;
+  }
+}
+
+export interface LineInfo {
+  line: any;
+  handle: any;
+  text: string;
+  /** Object mapping gutter IDs to marker elements. */
+  gutterMarkers: any;
+  textClass: string;
+  bgClass: string;
+  wrapClass: string;
+  /** Array of line widgets attached to this line. */
+  widgets: any;
+}

src/notebookTracker/index.ts

@@ -1,174 +1,64 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-import { INotebookTracker, NotebookPanel } from '@jupyterlab/notebook';
-import { CodeCell } from '@jupyterlab/cells';
-import { CodeMirrorEditor } from '@jupyterlab/codemirror';
-import { Editor, Doc } from 'codemirror';
+import {
+  INotebookTracker,
+  NotebookPanel,
+  NotebookTracker
+} from '@jupyterlab/notebook';
+// import { CodeCell } from '@jupyterlab/cells';
 import { DebugSession } from './../session';
 import { IClientSession } from '@jupyterlab/apputils';
 import { BreakpointsService } from '../breakpointsService';
+import { CodeCell } from '@jupyterlab/cells';
+import { CellManager } from '../cellManeger';
 
 export class DebuggerNotebookTracker {
   constructor(options: DebuggerNotebookTracker.IOptions) {
     this.breakpointService = options.breakpointService;
     this.notebookTracker = options.notebookTracker;
-    this.notebookTracker.widgetAdded.connect(
-      (sender, notePanel: NotebookPanel) => {
-        this.newDebuggerSession(notePanel.session);
-      }
-    );
 
     this.notebookTracker.currentChanged.connect(
       (sender, notePanel: NotebookPanel) => {
-        this.newDebuggerSession(notePanel.session);
-      }
-    );
-
-    this.breakpointService.selectedBreakpointsChanged.connect(
-      (sender, update) => {
-        if (update && update.length === 0) {
-          this.clearGutter(this.getCell());
-        }
+        this.newDebuggerSession(notePanel.session, sender);
       }
     );
   }
 
   notebookTracker: INotebookTracker;
-  previousCell: CodeCell;
-  previousLineCount: number;
   debuggerSession: DebugSession;
   breakpointService: BreakpointsService;
+  cellManager: CellManager;
+
+  protected test(noteTracker: NotebookTracker, codeCell: CodeCell) {
+    setTimeout(() => {
+      if (this.cellManager) {
+        this.cellManager.debuggerSessionId = this.debuggerSession.id;
+        this.cellManager.activeCell = codeCell;
+        this.cellManager.onActiveCellChanged();
+      } else {
+        const options: CellManager.IOptions = {
+          breakpointService: this.breakpointService,
+          activeCell: codeCell,
+          sessionId: this.debuggerSession.id
+        };
+        this.cellManager = new CellManager(options);
+      }
+      // console.log('active cell changed', this);
+    });
+  }
 
-  protected async newDebuggerSession(client: IClientSession) {
+  protected newDebuggerSession(client: IClientSession, note: INotebookTracker) {
     if (this.debuggerSession) {
       this.debuggerSession.dispose();
+      note.activeCellChanged.disconnect(this.test, this);
     }
-
     // create new session. Just changing client make sometimes that kernel is not attach to note
     this.debuggerSession = new DebugSession({
       client: client
     });
-    await this.notebookTracker.activeCellChanged.connect(
-      this.onActiveCellChanged,
-      this
-    );
-  }
-
-  protected clearGutter(cell: CodeCell) {
-    const editor = cell.editor as CodeMirrorEditor;
-    editor.doc.eachLine(line => {
-      if ((line as LineInfo).gutterMarkers) {
-        editor.editor.setGutterMarker(line, 'breakpoints', null);
-      }
-    });
-  }
-
-  protected async onActiveCellChanged() {
-    const activeCell = this.getCell();
-    // this run before change note, consider how to resolve this
-    if (activeCell && activeCell.editor && this.debuggerSession) {
-      this.breakpointService.onSelectedBreakpoints(
-        this.debuggerSession.id,
-        this.getEditorId()
-      );
-      if (this.previousCell && !this.previousCell.isDisposed) {
-        this.removeListner(this.previousCell);
-        this.clearGutter(this.previousCell);
-        this.breakpointService.clearSelectedBreakpoints();
-      }
-      this.previousCell = activeCell;
-      this.setEditor(activeCell);
-    }
-  }
-
-  protected setEditor(cell: CodeCell) {
-    if (!cell || !cell.editor) {
-      return;
-    }
-
-    const editor = cell.editor as CodeMirrorEditor;
 
-    this.previousLineCount = editor.lineCount;
-
-    editor.setOption('lineNumbers', true);
-    editor.editor.setOption('gutters', [
-      'CodeMirror-linenumbers',
-      'breakpoints'
-    ]);
-
-    editor.editor.on('gutterClick', this.onGutterClick);
-    editor.editor.on('renderLine', this.onNewRenderLine);
-  }
-
-  protected removeListner(cell: CodeCell) {
-    const editor = cell.editor as CodeMirrorEditor;
-    editor.setOption('lineNumbers', false);
-    editor.editor.off('gutterClick', this.onGutterClick);
-    editor.editor.off('renderLine', this.onNewRenderLine);
-  }
-
-  protected getCell(): CodeCell {
-    return this.notebookTracker.activeCell as CodeCell;
-  }
-
-  getEditorId(): string {
-    return this.getCell().editor.uuid;
-  }
-
-  protected onGutterClick = (editor: Editor, lineNumber: number) => {
-    const info = editor.lineInfo(lineNumber);
-    if (!info) {
-      return;
-    }
-
-    const isRemoveGutter = !!info.gutterMarkers;
-    if (isRemoveGutter) {
-      this.breakpointService.removeBreakpoint(
-        this.debuggerSession.id,
-        this.getEditorId,
-        info as LineInfo
-      );
-    } else {
-      this.breakpointService.addBreakpoint(
-        this.debuggerSession.id,
-        this.getEditorId(),
-        info as LineInfo
-      );
-    }
-
-    editor.setGutterMarker(
-      lineNumber,
-      'breakpoints',
-      isRemoveGutter ? null : this.createMarkerNode()
-    );
-  };
-
-  protected onNewRenderLine = (editor: Editor, line: any) => {
-    const lineInfo = editor.lineInfo(line);
-    if (lineInfo.handle && lineInfo.handle.order === false) {
-      return;
-    }
-
-    const doc: Doc = editor.getDoc();
-    const linesNumber = doc.lineCount();
-
-    if (this.previousLineCount !== linesNumber) {
-      if (this.previousLineCount < linesNumber) {
-        this.breakpointService.changeLines(lineInfo, +1);
-      }
-      if (this.previousLineCount > linesNumber) {
-        this.breakpointService.changeLines(lineInfo, -1);
-      }
-      this.previousLineCount = linesNumber;
-    }
-  };
-
-  private createMarkerNode() {
-    var marker = document.createElement('div');
-    marker.className = 'jp-breakpoint-marker';
-    marker.innerHTML = '●';
-    return marker;
+    note.activeCellChanged.connect(this.test, this);
   }
 }
 
@@ -178,16 +68,3 @@ export namespace DebuggerNotebookTracker {
     breakpointService: BreakpointsService;
   }
 }
-
-export interface LineInfo {
-  line: any;
-  handle: any;
-  text: string;
-  /** Object mapping gutter IDs to marker elements. */
-  gutterMarkers: any;
-  textClass: string;
-  bgClass: string;
-  wrapClass: string;
-  /** Array of line widgets attached to this line. */
-  widgets: any;
-}