Renaming of CodeMirrorRenderers

src/console/codemirror/plugin.ts

@@ -6,13 +6,13 @@ import {
 } from '../widget';
 
 import {
-  defaultCodeMirrorRenderer, CodeMirrorRenderer
+  defaultCodeMirrorConsoleRenderer, CodeMirrorConsoleRenderer
 } from './widget';
 
 export const rendererProvider = {
   id: 'jupyter.services.console.codemirror.renderer',
   provides: ConsoleWidget.Renderer,
   resolve: () => {
-    return defaultCodeMirrorRenderer
+    return defaultCodeMirrorConsoleRenderer
   }
 };

src/console/codemirror/widget.ts

@@ -14,18 +14,18 @@ import {
 } from '../../notebook/cells/widget';
 
 import {
-    defaultCodeCellRenderer, defaultRawCellRenderer
+    defaultCodeMirrorCodeCellRenderer, defaultCodeMirrorRawCellRenderer
 } from '../../notebook/codemirror/notebook/widget';
 
 import {
     ConsoleWidget
 } from '../widget';
 
-export class CodeMirrorRenderer extends ConsoleWidget.Renderer {
+export class CodeMirrorConsoleRenderer extends ConsoleWidget.Renderer {
 
     createBanner(): RawCellWidget {
         let widget = new RawCellWidget({
-            renderer: defaultRawCellRenderer
+            renderer: defaultCodeMirrorRawCellRenderer
         });
         widget.model = new RawCellModel();
         return widget;
@@ -34,7 +34,7 @@ export class CodeMirrorRenderer extends ConsoleWidget.Renderer {
     createPrompt(rendermime: RenderMime): CodeCellWidget {
         let widget = new CodeCellWidget({
             rendermime,
-            renderer: defaultCodeCellRenderer
+            renderer: defaultCodeMirrorCodeCellRenderer
         });
         widget.model = new CodeCellModel();
         return widget;
@@ -42,4 +42,4 @@ export class CodeMirrorRenderer extends ConsoleWidget.Renderer {
 
 }
 
-export const defaultCodeMirrorRenderer = new CodeMirrorRenderer();
+export const defaultCodeMirrorConsoleRenderer = new CodeMirrorConsoleRenderer();

src/notebook/codemirror/cells/editor.ts

@@ -29,7 +29,7 @@ import {
 } from '../../cells/model';
 
 import {
-  ICellEditorWidget, EdgeLocation, ITextChange, ICompletionRequest, ICoords
+  ICellEditorWidget, ICellEditorWidgetExtension, EdgeLocation, ITextChange, ICompletionRequest, ICoords
 } from '../../cells/editor'
 
 /**
@@ -57,7 +57,7 @@ const CELL_EDITOR_CLASS = 'jp-CellEditor';
  * A widget for a cell editor.
  */
 export
-class CellEditorWidget extends CodeMirrorWidget implements ICellEditorWidget {
+class CodeMirrorCellEditorWidget extends CodeMirrorWidget implements ICellEditorWidgetExtension {
   /**
    * Construct a new cell editor widget.
    */

src/notebook/codemirror/cells/widget.ts

@@ -10,7 +10,7 @@ import {
 } from '../../cells/widget';
 
 import {
-    CellEditorWidget
+    CodeMirrorCellEditorWidget
 } from './editor';
 
 export const defaultEditorConfiguration: CodeMirror.EditorConfiguration = {
@@ -30,14 +30,14 @@ export const defaultEditorConfiguration: CodeMirror.EditorConfiguration = {
     }
 };
 
-export class CodeMirrorRenderer extends CodeCellWidget.Renderer {
+export class CodeMirrorCodeCellWidgetRenderer extends CodeCellWidget.Renderer {
 
     private _editorConfiguration: CodeMirror.EditorConfiguration = defaultEditorConfiguration;
-    private _editorInitializer: (editor: CellEditorWidget) => void = editor => {};
+    private _editorInitializer: (editor: CodeMirrorCellEditorWidget) => void = editor => {};
 
     constructor(options: {
         editorConfiguration?: CodeMirror.EditorConfiguration,
-        editorInitializer?: (editor: CellEditorWidget) => void
+        editorInitializer?: (editor: CodeMirrorCellEditorWidget) => void
     } = {}) {
         super();
         this._editorConfiguration = options.editorConfiguration || this._editorConfiguration
@@ -45,11 +45,11 @@ export class CodeMirrorRenderer extends CodeCellWidget.Renderer {
     }
 
     createCellEditor(): ICellEditorWidget {
-        const widget = new CellEditorWidget(this._editorConfiguration);
+        const widget = new CodeMirrorCellEditorWidget(this._editorConfiguration);
         this._editorInitializer(widget);
         return widget;
     }
 
 }
 
-export const defaultCodeMirrorRenderer = new CodeMirrorRenderer();
+export const defaultCodeMirrorCodeCellWidgetRenderer = new CodeMirrorCodeCellWidgetRenderer();

src/notebook/codemirror/notebook/panel.ts

@@ -13,18 +13,19 @@ import {
     NotebookPanel
 } from '../../notebook/panel';
 
-import * as widget
-from './widget';
+import {
+    defaultCodeMirrorNotebookRenderer
+} from './widget';
 
-export class CodeMirrorRenderer extends NotebookPanel.Renderer {
+export class CodeMirrorNotebookPanelRenderer extends NotebookPanel.Renderer {
 
     createContent(rendermime: RenderMime): Notebook  {
         return new Notebook({
             rendermime,
-            renderer: widget.defaultCodeMirrorRenderer
+            renderer: defaultCodeMirrorNotebookRenderer
         });
     }
 
 }
 
-export const defaultCodeMirrorRenderer = new CodeMirrorRenderer()
+export const defaultCodeMirrorNotebookPanelRenderer = new CodeMirrorNotebookPanelRenderer()

src/notebook/codemirror/notebook/widget.ts

@@ -17,36 +17,37 @@ import {
   Notebook
 } from '../../notebook/widget';
 
-import * as cells
-from '../cells/widget';
+import {
+  CodeMirrorCodeCellWidgetRenderer, defaultCodeMirrorCodeCellWidgetRenderer
+} from '../cells/widget';
 
-export const defaultCodeCellRenderer = new cells.CodeMirrorRenderer({
+export const defaultCodeMirrorCodeCellRenderer = new CodeMirrorCodeCellWidgetRenderer({
   editorInitializer: (editor) => {
     editor.editor.setOption('matchBrackets', true);
     editor.editor.setOption('autoCloseBrackets', true);
   }
 });
 
-export const defaultMarkdownCellRenderer = new cells.CodeMirrorRenderer({
+export const defaultCodeMirrorMarkdownCellRenderer = new CodeMirrorCodeCellWidgetRenderer({
   editorInitializer: (editor) => {
     // Turn on line wrapping for markdown cells.
     editor.editor.setOption('lineWrapping', true);
   }
 });
 
-export const defaultRawCellRenderer = new cells.CodeMirrorRenderer({
+export const defaultCodeMirrorRawCellRenderer = new CodeMirrorCodeCellWidgetRenderer({
   editorInitializer: (editor) => {
     // Turn on line wrapping for markdown cells.
     editor.editor.setOption('lineWrapping', true);
   }
 });
 
-export class CodeMirrorRenderer extends Notebook.Renderer {
+export class CodeMirrorNotebookRenderer extends Notebook.Renderer {
 
   createCodeCell(model: ICodeCellModel, rendermime: RenderMime): CodeCellWidget {
     const widget = new CodeCellWidget({
       rendermime,
-      renderer: defaultCodeCellRenderer
+      renderer: defaultCodeMirrorCodeCellRenderer
     });
     widget.model = model;
     return widget;
@@ -55,7 +56,7 @@ export class CodeMirrorRenderer extends Notebook.Renderer {
   createMarkdownCell(model: IMarkdownCellModel, rendermime: RenderMime): MarkdownCellWidget {
     const widget = new MarkdownCellWidget({
       rendermime,
-      renderer: defaultMarkdownCellRenderer
+      renderer: defaultCodeMirrorMarkdownCellRenderer
     });
     widget.model = model;
     return widget;
@@ -63,7 +64,7 @@ export class CodeMirrorRenderer extends Notebook.Renderer {
 
   createRawCell(model: IRawCellModel): RawCellWidget {
     const widget = new RawCellWidget({
-      renderer: defaultRawCellRenderer
+      renderer: defaultCodeMirrorRawCellRenderer
     });
     widget.model = model;
     return widget;
@@ -71,4 +72,4 @@ export class CodeMirrorRenderer extends Notebook.Renderer {
 
 }
 
-export const defaultCodeMirrorRenderer = new CodeMirrorRenderer();
+export const defaultCodeMirrorNotebookRenderer = new CodeMirrorNotebookRenderer();

src/notebook/codemirror/plugin.ts

@@ -6,13 +6,13 @@ import {
 } from '../notebook/panel';
 
 import {
-  defaultCodeMirrorRenderer, CodeMirrorRenderer
+  defaultCodeMirrorNotebookPanelRenderer, CodeMirrorNotebookPanelRenderer
 } from './notebook/panel';
 
 export const rendererProvider = {
   id: 'jupyter.services.notebook.codemirror.renderer',
   provides: NotebookPanel.Renderer,
   resolve: () => {
-    return defaultCodeMirrorRenderer
+    return defaultCodeMirrorNotebookPanelRenderer
   }
 };

test/src/notebook/cells/editor.spec.ts

@@ -19,7 +19,7 @@ import {
 } from '../../../../lib/notebook/cells/editor';
 
 import {
-  CellEditorWidget
+  CodeMirrorCellEditorWidget
 } from '../../../../lib/notebook/codemirror/cells/editor';
 
 
@@ -30,7 +30,7 @@ const DOWN_ARROW = 40;
 const TAB = 9;
 
 
-class LogEditorWidget extends CellEditorWidget {
+class LogEditorWidget extends CodeMirrorCellEditorWidget {
   methods: string[] = [];
 
   protected onModelStateChanged(model: ICellModel, args: any): void {
@@ -57,17 +57,17 @@ class LogEditorWidget extends CellEditorWidget {
 
 describe('notebook/cells/editor', () => {
 
-  describe('CellEditorWidget', () => {
+  describe('CodeMirrorCellEditorWidget', () => {
 
     describe('#constructor()', () => {
 
       it('should create a cell editor widget', () => {
-        let widget = new CellEditorWidget();
-        expect(widget).to.be.a(CellEditorWidget);
+        let widget = new CodeMirrorCellEditorWidget();
+        expect(widget).to.be.a(CodeMirrorCellEditorWidget);
       });
 
       it('should accept editor configuration options', () => {
-        let widget = new CellEditorWidget({
+        let widget = new CodeMirrorCellEditorWidget({
           value: 'foo',
           mode: 'bar'
         });
@@ -80,12 +80,12 @@ describe('notebook/cells/editor', () => {
     describe('#lineNumbers', () => {
 
       it('should get the line numbers state of the editor', () => {
-        let widget = new CellEditorWidget(new CellModel());
+        let widget = new CodeMirrorCellEditorWidget(new CellModel());
         expect(widget.lineNumbers).to.be(widget.editor.getOption('lineNumbers'));
       });
 
       it('should set the line numbers state of the editor', () => {
-        let widget = new CellEditorWidget(new CellModel());
+        let widget = new CodeMirrorCellEditorWidget(new CellModel());
         widget.lineNumbers = !widget.lineNumbers;
         expect(widget.lineNumbers).to.be(widget.editor.getOption('lineNumbers'));
       });
@@ -95,7 +95,7 @@ describe('notebook/cells/editor', () => {
     describe('#edgeRequested', () => {
 
       it('should emit a signal when the top edge is requested', () => {
-        let widget = new CellEditorWidget(new CellModel());
+        let widget = new CodeMirrorCellEditorWidget(new CellModel());
         let edge: EdgeLocation = null;
         let event = generate('keydown', { keyCode: UP_ARROW });
         let listener = (sender: any, args: EdgeLocation) => { edge = args; }
@@ -106,7 +106,7 @@ describe('notebook/cells/editor', () => {
       });
 
       it('should emit a signal when the bottom edge is requested', () => {
-        let widget = new CellEditorWidget(new CellModel());
+        let widget = new CodeMirrorCellEditorWidget(new CellModel());
         let edge: EdgeLocation = null;
         let event = generate('keydown', { keyCode: DOWN_ARROW });
         let listener = (sender: any, args: EdgeLocation) => { edge = args; }
@@ -121,7 +121,7 @@ describe('notebook/cells/editor', () => {
     describe('#textChanged', () => {
 
       it('should emit a signal when editor text is changed', () => {
-        let widget = new CellEditorWidget();
+        let widget = new CodeMirrorCellEditorWidget();
         widget.model = new CellModel();
         let doc = widget.editor.getDoc();
         let want = { oldValue: '', newValue: 'foo' };
@@ -133,7 +133,7 @@ describe('notebook/cells/editor', () => {
         };
         widget.textChanged.connect(listener);
 
-        // CellEditorWidget suppresses signals when the code mirror instance's
+        // CodeMirrorCellEditorWidget suppresses signals when the code mirror instance's
         // content is changed programmatically via the `setValue` method, so
         // for this test, the `replaceRange` method is being used to generate
         // the text change.
@@ -145,7 +145,7 @@ describe('notebook/cells/editor', () => {
       });
 
       it('should not emit a signal if editor text already matches model', () => {
-        let widget = new CellEditorWidget();
+        let widget = new CodeMirrorCellEditorWidget();
         widget.model = new CellModel();
         let doc = widget.editor.getDoc();
         let fromPos = { line: 0, ch: 0 };
@@ -165,7 +165,7 @@ describe('notebook/cells/editor', () => {
     describe('#completionRequested', () => {
 
       it('should emit a signal when the user requests a tab completion', () => {
-        let widget = new CellEditorWidget();
+        let widget = new CodeMirrorCellEditorWidget();
         widget.model = new CellModel();
         let doc = widget.editor.getDoc();
         let want = { currentValue: 'foo', line: 0, ch: 3 };
@@ -193,7 +193,7 @@ describe('notebook/cells/editor', () => {
 
       it('should be settable', () => {
         let model = new CellModel();
-        let widget = new CellEditorWidget();
+        let widget = new CodeMirrorCellEditorWidget();
         expect(widget.model).to.be(null);
         widget.model = model;
         expect(widget.model).to.be(model);
@@ -201,14 +201,14 @@ describe('notebook/cells/editor', () => {
 
       it('should be safe to set multiple times', () => {
         let model = new CellModel();
-        let widget = new CellEditorWidget();
+        let widget = new CodeMirrorCellEditorWidget();
         widget.model = new CellModel();
         widget.model = model;
         expect(widget.model).to.be(model);
       });
 
       it('should empty the code mirror if set to null', () => {
-        let widget = new CellEditorWidget();
+        let widget = new CodeMirrorCellEditorWidget();
         widget.model = new CellModel();
         widget.model.source = 'foo';
         expect(widget.editor.getDoc().getValue()).to.be('foo');
@@ -221,7 +221,7 @@ describe('notebook/cells/editor', () => {
     describe('#dispose()', () => {
 
       it('should dispose of the resources held by the widget', () => {
-        let widget = new CellEditorWidget();
+        let widget = new CodeMirrorCellEditorWidget();
         widget.model = new CellModel();
         expect(widget.model).to.be.ok();
         widget.dispose();
@@ -234,7 +234,7 @@ describe('notebook/cells/editor', () => {
     describe('#getCursorPosition()', () => {
 
       it('should return the cursor position of the editor', () => {
-        let widget = new CellEditorWidget();
+        let widget = new CodeMirrorCellEditorWidget();
         widget.model = new CellModel();
         let doc = widget.editor.getDoc();
         let fromPos = { line: 0, ch: 0 };
@@ -250,7 +250,7 @@ describe('notebook/cells/editor', () => {
     describe('#setCursorPosition()', () => {
 
       it('should set the cursor position of the editor', () => {
-        let widget = new CellEditorWidget();
+        let widget = new CodeMirrorCellEditorWidget();
         widget.model = new CellModel();
         expect(widget.getCursorPosition()).to.be(0);
         widget.model.source = 'foo';

test/src/notebook/cells/widget.spec.ts

@@ -26,15 +26,15 @@ import {
 } from '../../../../lib/notebook/cells';
 
 import {
-  CellEditorWidget
+  CodeMirrorCellEditorWidget
 } from '../../../../lib/notebook/codemirror/cells/editor';
 
 import {
-  CodeMirrorRenderer, defaultCodeMirrorRenderer
+  CodeMirrorCodeCellWidgetRenderer, defaultCodeMirrorCodeCellWidgetRenderer
 } from '../../../../lib/notebook/codemirror/cells/widget';
 
 import {
-  defaultCodeCellRenderer, defaultMarkdownCellRenderer, defaultRawCellRenderer
+  defaultCodeMirrorCodeCellRenderer, defaultCodeMirrorMarkdownCellRenderer, defaultCodeMirrorRawCellRenderer
 } from '../../../../lib/notebook/codemirror/notebook/widget';
 
 import {
@@ -66,7 +66,7 @@ class LogBaseCell extends BaseCellWidget {
 
   constructor() {
     super({
-      renderer: defaultCodeMirrorRenderer
+      renderer: defaultCodeMirrorCodeCellWidgetRenderer
     })
   }
 
@@ -134,7 +134,7 @@ class LogMarkdownCell extends MarkdownCellWidget {
 }
 
 
-class LogRenderer extends CodeMirrorRenderer {
+class LogRenderer extends CodeMirrorCodeCellWidgetRenderer {
   methods: string[] = [];
 
   createCellEditor(): ICellEditorWidget {
@@ -162,7 +162,7 @@ describe('notebook/cells/widget', () => {
 
       it('should create a base cell widget', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorRenderer
+          renderer: defaultCodeMirrorCodeCellWidgetRenderer
         });
         expect(widget).to.be.a(BaseCellWidget);
       });
@@ -187,7 +187,7 @@ describe('notebook/cells/widget', () => {
       it('should be settable', () => {
         let model = new CellModel();
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorRenderer
+          renderer: defaultCodeMirrorCodeCellWidgetRenderer
         });
         expect(widget.model).to.be(null);
         widget.model = model;
@@ -202,7 +202,7 @@ describe('notebook/cells/widget', () => {
 
       it('should emit a signal when the model changes', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorRenderer
+          renderer: defaultCodeMirrorCodeCellWidgetRenderer
         });
         let called = false;
         widget.modelChanged.connect(() => { called = true; });
@@ -213,7 +213,7 @@ describe('notebook/cells/widget', () => {
 
       it('should not emit a signal when the model has not changed', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorRenderer
+          renderer: defaultCodeMirrorCodeCellWidgetRenderer
         });
         let model = new CellModel();
         let called = 0;
@@ -231,14 +231,14 @@ describe('notebook/cells/widget', () => {
 
       it('should be a cell editor widget', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorRenderer
+          renderer: defaultCodeMirrorCodeCellWidgetRenderer
         });
-        expect(widget.editor).to.be.a(CellEditorWidget);
+        expect(widget.editor).to.be.a(CodeMirrorCellEditorWidget);
       });
 
       it('should be read-only', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorRenderer
+          renderer: defaultCodeMirrorCodeCellWidgetRenderer
         });
         expect(() => { widget.editor = null; }).to.throwError();
       });
@@ -249,21 +249,21 @@ describe('notebook/cells/widget', () => {
 
       it('should be a string', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorRenderer
+          renderer: defaultCodeMirrorCodeCellWidgetRenderer
         });
         expect(typeof widget.mimetype).to.be('string');
       });
 
       it('should default to text/plain', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorRenderer
+          renderer: defaultCodeMirrorCodeCellWidgetRenderer
         });
         expect(widget.mimetype).to.be('text/plain');
       });
 
       it('should supporting being set to other types', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorRenderer
+          renderer: defaultCodeMirrorCodeCellWidgetRenderer
         });
         widget.mimetype = 'test/test';
         expect(widget.mimetype).to.be('test/test');
@@ -271,7 +271,7 @@ describe('notebook/cells/widget', () => {
 
       it('should be safe to set multiple times', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorRenderer
+          renderer: defaultCodeMirrorCodeCellWidgetRenderer
         });
         widget.mimetype = 'test/test';
         widget.mimetype = 'test/test';
@@ -280,7 +280,7 @@ describe('notebook/cells/widget', () => {
 
       it('should not allow being set to empty or null strings', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorRenderer
+          renderer: defaultCodeMirrorCodeCellWidgetRenderer
         });
         widget.mimetype = null;
         expect(widget.mimetype).to.be('text/plain');
@@ -294,21 +294,21 @@ describe('notebook/cells/widget', () => {
 
       it('should be a boolean', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorRenderer
+          renderer: defaultCodeMirrorCodeCellWidgetRenderer
         });
         expect(typeof widget.readOnly).to.be('boolean');
       });
 
       it('should default to false', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorRenderer
+          renderer: defaultCodeMirrorCodeCellWidgetRenderer
         });
         expect(widget.readOnly).to.be(false);
       });
 
       it('should be settable', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorRenderer
+          renderer: defaultCodeMirrorCodeCellWidgetRenderer
         });
         widget.readOnly = true;
         expect(widget.readOnly).to.be(true);
@@ -330,21 +330,21 @@ describe('notebook/cells/widget', () => {
 
       it('should be a boolean', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorRenderer
+          renderer: defaultCodeMirrorCodeCellWidgetRenderer
         });
         expect(typeof widget.trusted).to.be('boolean');
       });
 
       it('should default to false', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorRenderer
+          renderer: defaultCodeMirrorCodeCellWidgetRenderer
         });
         expect(widget.trusted).to.be(false);
       });
 
       it('should be settable', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorRenderer
+          renderer: defaultCodeMirrorCodeCellWidgetRenderer
         });
         widget.model = new CellModel();
         widget.trusted = true;
@@ -353,7 +353,7 @@ describe('notebook/cells/widget', () => {
 
       it('should do nothing if there is no model', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorRenderer
+          renderer: defaultCodeMirrorCodeCellWidgetRenderer
         });
         expect(widget.trusted).to.be(false);
         widget.trusted = true;
@@ -366,7 +366,7 @@ describe('notebook/cells/widget', () => {
 
       it('should focus the cell editor', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorRenderer
+          renderer: defaultCodeMirrorCodeCellWidgetRenderer
         });
         widget.attach(document.body);
         expect(widget.editor.hasFocus()).to.be(false);
@@ -381,7 +381,7 @@ describe('notebook/cells/widget', () => {
 
       it('should not throw an error (full test in input area)', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorRenderer
+          renderer: defaultCodeMirrorCodeCellWidgetRenderer
         });
         expect(() => { widget.setPrompt(void 0); }).to.not.throwError();
         expect(() => { widget.setPrompt(null); }).to.not.throwError();
@@ -395,7 +395,7 @@ describe('notebook/cells/widget', () => {
     describe('#toggleInput()', () => {
 
       it('should toggle whether the input is shown', () => {
-        let widget = new BaseCellWidget({renderer: defaultCodeMirrorRenderer});
+        let widget = new BaseCellWidget({renderer: defaultCodeMirrorCodeCellWidgetRenderer});
         let input = widget.node.getElementsByClassName(INPUT_CLASS)[0];
         Widget.attach(widget, document.body);
         expect(window.getComputedStyle(input).display).to.not.be('none');
@@ -410,13 +410,13 @@ describe('notebook/cells/widget', () => {
     describe('#dispose()', () => {
 
       it('should dispose of the resources held by the widget', () => {
-        let widget = new BaseCellWidget({renderer: defaultCodeMirrorRenderer});
+        let widget = new BaseCellWidget({renderer: defaultCodeMirrorCodeCellWidgetRenderer});
         widget.dispose();
         expect(widget.isDisposed).to.be(true);
       });
 
       it('should be safe to call multiple times', () => {
-        let widget = new BaseCellWidget({renderer: defaultCodeMirrorRenderer});
+        let widget = new BaseCellWidget({renderer: defaultCodeMirrorCodeCellWidgetRenderer});
         widget.dispose();
         widget.dispose();
         expect(widget.isDisposed).to.be(true);
@@ -494,7 +494,7 @@ describe('notebook/cells/widget', () => {
       describe('#constructor()', () => {
 
         it('should create a renderer', () => {
-          let renderer = new CodeMirrorRenderer();
+          let renderer = new CodeMirrorCodeCellWidgetRenderer();
           expect(renderer).to.be.a(BaseCellWidget.Renderer);
         });
 
@@ -503,9 +503,9 @@ describe('notebook/cells/widget', () => {
       describe('#createCellEditor()', () => {
 
         it('should create a cell editor widget', () => {
-          let renderer = new CodeMirrorRenderer();
+          let renderer = new CodeMirrorCodeCellWidgetRenderer();
           let editor = renderer.createCellEditor();
-          expect(editor).to.be.a(CellEditorWidget);
+          expect(editor).to.be.a(CodeMirrorCellEditorWidget);
         });
 
       });
@@ -513,7 +513,7 @@ describe('notebook/cells/widget', () => {
       describe('#createInputArea()', () => {
 
         it('should create an input area widget', () => {
-          let renderer = new CodeMirrorRenderer();
+          let renderer = new CodeMirrorCodeCellWidgetRenderer();
           let editor = renderer.createCellEditor();
           let input = renderer.createInputArea(editor);
           expect(input).to.be.an(InputAreaWidget);
@@ -524,7 +524,7 @@ describe('notebook/cells/widget', () => {
       describe('#defaultRenderer', () => {
 
         it('should be a renderer', () => {
-          let defaultRenderer = defaultCodeMirrorRenderer;
+          let defaultRenderer = defaultCodeMirrorCodeCellWidgetRenderer;
           expect(defaultRenderer).to.be.a(BaseCellWidget.Renderer);
         });
 
@@ -539,7 +539,7 @@ describe('notebook/cells/widget', () => {
     describe('#constructor()', () => {
 
       it('should create a code cell widget', () => {
-        let widget = new CodeCellWidget({ rendermime, renderer: defaultCodeCellRenderer });
+        let widget = new CodeCellWidget({ rendermime, renderer: defaultCodeMirrorCodeCellRenderer });
         expect(widget).to.be.a(CodeCellWidget);
       });
 
@@ -564,13 +564,13 @@ describe('notebook/cells/widget', () => {
     describe('#dispose()', () => {
 
       it('should dispose of the resources held by the widget', () => {
-        let widget = new CodeCellWidget({ rendermime, renderer: defaultCodeCellRenderer });
+        let widget = new CodeCellWidget({ rendermime, renderer: defaultCodeMirrorCodeCellRenderer });
         widget.dispose();
         expect(widget.isDisposed).to.be(true);
       });
 
       it('should be safe to call multiple times', () => {
-        let widget = new CodeCellWidget({ rendermime, renderer: defaultCodeCellRenderer });
+        let widget = new CodeCellWidget({ rendermime, renderer: defaultCodeMirrorCodeCellRenderer });
         widget.dispose();
         widget.dispose();
         expect(widget.isDisposed).to.be(true);
@@ -581,14 +581,14 @@ describe('notebook/cells/widget', () => {
     describe('#execute()', () => {
 
       it('should fulfill a promise if there is no code to execute', (done) => {
-        let widget = new CodeCellWidget({ rendermime, renderer: defaultCodeCellRenderer });
+        let widget = new CodeCellWidget({ rendermime, renderer: defaultCodeMirrorCodeCellRenderer });
         let kernel = new MockKernel();
         widget.model = new CodeCellModel();
         widget.execute(kernel).then(() => { done(); });
       });
 
       it('should fulfill a promise if there is code to execute', (done) => {
-        let widget = new CodeCellWidget({ rendermime, renderer: defaultCodeCellRenderer });
+        let widget = new CodeCellWidget({ rendermime, renderer: defaultCodeMirrorCodeCellRenderer });
         let kernel = new MockKernel();
         widget.model = new CodeCellModel();
         widget.model.source = 'foo';
@@ -606,7 +606,7 @@ describe('notebook/cells/widget', () => {
     describe('#onUpdateRequest()', () => {
 
       it('should update the widget', () => {
-        let widget = new LogCodeCell({ rendermime, renderer: defaultCodeCellRenderer });
+        let widget = new LogCodeCell({ rendermime, renderer: defaultCodeMirrorCodeCellRenderer });
         expect(widget.methods).to.not.contain('onUpdateRequest');
         sendMessage(widget, WidgetMessage.UpdateRequest);
         expect(widget.methods).to.contain('onUpdateRequest');
@@ -618,7 +618,7 @@ describe('notebook/cells/widget', () => {
 
       it('should fire when the model changes', () => {
         let method = 'onModelChanged';
-        let widget = new LogCodeCell({ rendermime, renderer: defaultCodeCellRenderer });
+        let widget = new LogCodeCell({ rendermime, renderer: defaultCodeMirrorCodeCellRenderer });
         expect(widget.methods).to.not.contain(method);
         widget.model = new CodeCellModel();
         expect(widget.methods).to.contain(method);
@@ -630,7 +630,7 @@ describe('notebook/cells/widget', () => {
 
       it('should fire when model state changes', () => {
         let method = 'onModelStateChanged';
-        let widget = new LogCodeCell({ rendermime, renderer: defaultCodeCellRenderer });
+        let widget = new LogCodeCell({ rendermime, renderer: defaultCodeMirrorCodeCellRenderer });
         widget.model = new CodeCellModel();
         expect(widget.methods).to.not.contain(method);
         widget.model.source = 'foo';
@@ -643,7 +643,7 @@ describe('notebook/cells/widget', () => {
 
       it('should fire when model metadata changes', () => {
         let method = 'onMetadataChanged';
-        let widget = new LogCodeCell({ rendermime, renderer: defaultCodeCellRenderer });
+        let widget = new LogCodeCell({ rendermime, renderer: defaultCodeMirrorCodeCellRenderer });
         widget.model = new CodeCellModel();
         expect(widget.methods).to.not.contain(method);
         widget.model.metadataChanged.emit({
@@ -661,7 +661,7 @@ describe('notebook/cells/widget', () => {
       describe('#constructor()', () => {
 
         it('should create a renderer', () => {
-          let renderer = new CodeMirrorRenderer();
+          let renderer = new CodeMirrorCodeCellWidgetRenderer();
           expect(renderer).to.be.a(CodeCellWidget.Renderer);
         });
 
@@ -670,7 +670,7 @@ describe('notebook/cells/widget', () => {
       describe('#createOutputArea()', () => {
 
         it('should create an output area widget', () => {
-          let renderer = new CodeMirrorRenderer();
+          let renderer = new CodeMirrorCodeCellWidgetRenderer();
           let output = renderer.createOutputArea(rendermime);
           expect(output).to.be.an(OutputAreaWidget);
         });
@@ -680,7 +680,7 @@ describe('notebook/cells/widget', () => {
       describe('#defaultRenderer', () => {
 
         it('should be a renderer', () => {
-          let defaultRenderer = defaultCodeCellRenderer;
+          let defaultRenderer = defaultCodeMirrorCodeCellRenderer;
           expect(defaultRenderer).to.be.a(CodeCellWidget.Renderer);
         });
 
@@ -695,7 +695,7 @@ describe('notebook/cells/widget', () => {
     describe('#constructor()', () => {
 
       it('should create a markdown cell widget', () => {
-        let widget = new MarkdownCellWidget({ rendermime, renderer: defaultMarkdownCellRenderer });
+        let widget = new MarkdownCellWidget({ rendermime, renderer: defaultCodeMirrorMarkdownCellRenderer });
         expect(widget).to.be.a(MarkdownCellWidget);
       });
 
@@ -713,7 +713,7 @@ describe('notebook/cells/widget', () => {
       });
 
       it('should set the default mimetype to text/x-ipythongfm', () => {
-        let widget = new MarkdownCellWidget({ rendermime, renderer: defaultMarkdownCellRenderer });
+        let widget = new MarkdownCellWidget({ rendermime, renderer: defaultCodeMirrorMarkdownCellRenderer });
         expect(widget.mimetype).to.be('text/x-ipythongfm');
       });
 
@@ -722,7 +722,7 @@ describe('notebook/cells/widget', () => {
     describe('#rendered', () => {
 
       it('should default to true', (done) => {
-        let widget = new MarkdownCellWidget({ rendermime, renderer: defaultMarkdownCellRenderer });
+        let widget = new MarkdownCellWidget({ rendermime, renderer: defaultCodeMirrorMarkdownCellRenderer });
         widget.attach(document.body);
         expect(widget.rendered).to.be(true);
         requestAnimationFrame(() => {
@@ -733,7 +733,7 @@ describe('notebook/cells/widget', () => {
       });
 
       it('should unrender the widget', (done) => {
-        let widget = new MarkdownCellWidget({ rendermime, renderer: defaultMarkdownCellRenderer });
+        let widget = new MarkdownCellWidget({ rendermime, renderer: defaultCodeMirrorMarkdownCellRenderer });
         widget.attach(document.body);
         widget.rendered = false;
         requestAnimationFrame(() => {
@@ -744,7 +744,7 @@ describe('notebook/cells/widget', () => {
       });
 
       it('should ignore being set to the same value', (done) => {
-        let widget = new LogMarkdownCell({ rendermime, renderer: defaultMarkdownCellRenderer });
+        let widget = new LogMarkdownCell({ rendermime, renderer: defaultCodeMirrorMarkdownCellRenderer });
         widget.attach(document.body);
         widget.rendered = false;
         widget.rendered = false;
@@ -762,13 +762,13 @@ describe('notebook/cells/widget', () => {
     describe('#dispose()', () => {
 
       it('should dispose of the resources held by the widget', () => {
-        let widget = new MarkdownCellWidget({ rendermime, renderer: defaultMarkdownCellRenderer });
+        let widget = new MarkdownCellWidget({ rendermime, renderer: defaultCodeMirrorMarkdownCellRenderer });
         widget.dispose();
         expect(widget.isDisposed).to.be(true);
       });
 
       it('should be safe to call multiple times', () => {
-        let widget = new MarkdownCellWidget({ rendermime, renderer: defaultMarkdownCellRenderer });
+        let widget = new MarkdownCellWidget({ rendermime, renderer: defaultCodeMirrorMarkdownCellRenderer });
         widget.dispose();
         widget.dispose();
         expect(widget.isDisposed).to.be(true);
@@ -779,7 +779,7 @@ describe('notebook/cells/widget', () => {
     describe('#onUpdateRequest()', () => {
 
       it('should update the widget', () => {
-        let widget = new LogMarkdownCell({ rendermime, renderer: defaultMarkdownCellRenderer });
+        let widget = new LogMarkdownCell({ rendermime, renderer: defaultCodeMirrorMarkdownCellRenderer });
         expect(widget.methods).to.not.contain('onUpdateRequest');
         sendMessage(widget, WidgetMessage.UpdateRequest);
         expect(widget.methods).to.contain('onUpdateRequest');
@@ -794,7 +794,7 @@ describe('notebook/cells/widget', () => {
     describe('#constructor()', () => {
 
       it('should create a raw cell widget', () => {
-        let widget = new RawCellWidget({renderer:defaultRawCellRenderer});
+        let widget = new RawCellWidget({renderer:defaultCodeMirrorRawCellRenderer});
         expect(widget).to.be.a(RawCellWidget);
       });
 
@@ -807,7 +807,7 @@ describe('notebook/cells/widget', () => {
     describe('#constructor()', () => {
 
       it('should create an input area widget', () => {
-        let editor = new CellEditorWidget(new CellModel());
+        let editor = new CodeMirrorCellEditorWidget(new CellModel());
         let widget = new InputAreaWidget(editor);
         expect(widget).to.be.an(InputAreaWidget);
       });
@@ -817,7 +817,7 @@ describe('notebook/cells/widget', () => {
     describe('#setPrompt()', () => {
 
       it('should change the value of the input prompt', () => {
-        let editor = new CellEditorWidget(new CellModel());
+        let editor = new CodeMirrorCellEditorWidget(new CellModel());
         let widget = new InputAreaWidget(editor);
         let prompt = widget.node.querySelector(`.${PROMPT_CLASS}`);
         expect(prompt.textContent).to.be.empty();
@@ -826,7 +826,7 @@ describe('notebook/cells/widget', () => {
       });
 
       it('should treat the string value "null" as special', () => {
-        let editor = new CellEditorWidget(new CellModel());
+        let editor = new CodeMirrorCellEditorWidget(new CellModel());
         let widget = new InputAreaWidget(editor);
         let prompt = widget.node.querySelector(`.${PROMPT_CLASS}`);
         expect(prompt.textContent).to.be.empty();

test/src/notebook/completion/handler.spec.ts

@@ -16,7 +16,7 @@ import {
 } from '../../../../lib/notebook/cells';
 
 import {
-  ICompletionRequest, ICellEditorWidget, ITextChange
+  ICompletionRequest, ICellEditorWidgetExtension, ITextChange
 } from '../../../../lib/notebook/cells/editor';
 
 import {
@@ -24,7 +24,7 @@ import {
 } from '../../../../lib/notebook/completion';
 
 import {
-  defaultCodeMirrorRenderer
+  defaultCodeMirrorCodeCellWidgetRenderer
 } from '../../../../lib/notebook/codemirror/cells/widget';
 
 
@@ -57,12 +57,12 @@ class TestCompletionHandler extends CellCompletionHandler {
     this.methods.push('onReply');
   }
 
-  onTextChanged(editor: ICellEditorWidget, change: ITextChange): void {
+  onTextChanged(editor: ICellEditorWidgetExtension, change: ITextChange): void {
     super.onTextChanged(editor, change);
     this.methods.push('onTextChanged');
   }
 
-  onCompletionRequested(editor: ICellEditorWidget, request: ICompletionRequest): void {
+  onCompletionRequested(editor: ICellEditorWidgetExtension, request: ICompletionRequest): void {
     super.onCompletionRequested(editor, request);
     this.methods.push('onCompletionRequested');
   }
@@ -115,7 +115,7 @@ describe('notebook/completion/handler', () => {
 
       it('should be settable', () => {
         let handler = new CellCompletionHandler(new CompletionWidget());
-        let cell = new BaseCellWidget({renderer:defaultCodeMirrorRenderer});
+        let cell = new BaseCellWidget({renderer:defaultCodeMirrorCodeCellWidgetRenderer});
         expect(handler.activeCell).to.be(null);
         handler.activeCell = cell;
         expect(handler.activeCell).to.be.a(BaseCellWidget);
@@ -124,8 +124,8 @@ describe('notebook/completion/handler', () => {
 
       it('should be resettable', () => {
         let handler = new CellCompletionHandler(new CompletionWidget());
-        let one = new BaseCellWidget({renderer:defaultCodeMirrorRenderer});
-        let two = new BaseCellWidget({renderer:defaultCodeMirrorRenderer});
+        let one = new BaseCellWidget({renderer:defaultCodeMirrorCodeCellWidgetRenderer});
+        let two = new BaseCellWidget({renderer:defaultCodeMirrorCodeCellWidgetRenderer});
         expect(handler.activeCell).to.be(null);
         handler.activeCell = one;
         expect(handler.activeCell).to.be.a(BaseCellWidget);
@@ -315,11 +315,11 @@ describe('notebook/completion/handler', () => {
           oldValue: 'fo',
           newValue: 'foo'
         };
-        let cell = new BaseCellWidget({renderer:defaultCodeMirrorRenderer});
+        let cell = new BaseCellWidget({renderer:defaultCodeMirrorCodeCellWidgetRenderer});
 
         handler.activeCell = cell;
         expect(handler.methods).to.not.contain('onTextChanged');
-        cell.editor.textChanged.emit(change);
+        (cell.editor as ICellEditorWidgetExtension).textChanged.emit(change);
         expect(handler.methods).to.contain('onTextChanged');
       });
 
@@ -338,12 +338,12 @@ describe('notebook/completion/handler', () => {
           oldValue: 'fo',
           newValue: 'foo'
         };
-        let cell = new BaseCellWidget({renderer:defaultCodeMirrorRenderer});
+        let cell = new BaseCellWidget({renderer:defaultCodeMirrorCodeCellWidgetRenderer});
         let model = completion.model as TestCompletionModel;
 
         handler.activeCell = cell;
         expect(model.methods).to.not.contain('handleTextChange');
-        cell.editor.textChanged.emit(change);
+        (cell.editor as ICellEditorWidgetExtension).textChanged.emit(change);
         expect(model.methods).to.contain('handleTextChange');
       });
 
@@ -362,11 +362,11 @@ describe('notebook/completion/handler', () => {
           position: 0,
           currentValue: 'foo'
         };
-        let cell = new BaseCellWidget({renderer:defaultCodeMirrorRenderer});
+        let cell = new BaseCellWidget({renderer:defaultCodeMirrorCodeCellWidgetRenderer});
 
         handler.activeCell = cell;
         expect(handler.methods).to.not.contain('onCompletionRequested');
-        cell.editor.completionRequested.emit(request);
+        (cell.editor as ICellEditorWidgetExtension).completionRequested.emit(request);
         expect(handler.methods).to.contain('onCompletionRequested');
       });
 
@@ -384,13 +384,13 @@ describe('notebook/completion/handler', () => {
           position: 0,
           currentValue: 'foo'
         };
-        let cell = new BaseCellWidget({renderer:defaultCodeMirrorRenderer});
+        let cell = new BaseCellWidget({renderer:defaultCodeMirrorCodeCellWidgetRenderer});
         let model = completion.model as TestCompletionModel;
 
         handler.kernel = new MockKernel();
         handler.activeCell = cell;
         expect(handler.methods).to.not.contain('makeRequest');
-        cell.editor.completionRequested.emit(request);
+        (cell.editor as ICellEditorWidgetExtension).completionRequested.emit(request);
         expect(handler.methods).to.contain('makeRequest');
       });
 
@@ -414,7 +414,7 @@ describe('notebook/completion/handler', () => {
         let handler = new TestCompletionHandler(completion);
         let model = completion.model as TestCompletionModel;
 
-        handler.activeCell = new BaseCellWidget({renderer:defaultCodeMirrorRenderer});
+        handler.activeCell = new BaseCellWidget({renderer:defaultCodeMirrorCodeCellWidgetRenderer});
         expect(model.methods).to.not.contain('createPatch');
         completion.selected.emit('foo');
         expect(model.methods).to.contain('createPatch');
@@ -425,7 +425,7 @@ describe('notebook/completion/handler', () => {
         let patch = 'foobar';
         let completion = new CompletionWidget({ model });
         let handler = new TestCompletionHandler(completion);
-        let cell = new BaseCellWidget({renderer:defaultCodeMirrorRenderer});
+        let cell = new BaseCellWidget({renderer:defaultCodeMirrorCodeCellWidgetRenderer});
         let request: ICompletionRequest = {
           ch: 0,
           chHeight: 0,

test/src/notebook/notebook/actions.spec.ts

@@ -40,7 +40,7 @@ import {
 } from '../utils';
 
 import {
-  defaultCodeMirrorRenderer
+  defaultCodeMirrorNotebookRenderer
 } from '../../../../lib/notebook/codemirror/notebook/widget';
 
 
@@ -57,7 +57,7 @@ describe('notebook/notebook/actions', () => {
     beforeEach(() => {
       widget = new Notebook({ 
         rendermime: defaultRenderMime(),
-        renderer:defaultCodeMirrorRenderer
+        renderer:defaultCodeMirrorNotebookRenderer
       });
       let model = new NotebookModel();
       model.fromJSON(DEFAULT_CONTENT);

test/src/notebook/notebook/default-toolbar.spec.ts

@@ -44,7 +44,7 @@ import {
 } from '../utils';
 
 import {
-  defaultCodeMirrorRenderer
+  defaultCodeMirrorNotebookPanelRenderer
 } from '../../../../lib/notebook/codemirror/notebook/panel';
 
 
@@ -63,7 +63,7 @@ describe('notebook/notebook/default-toolbar', () => {
     let context: MockContext<NotebookModel>;
 
     beforeEach((done) => {
-      panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorRenderer });
+      panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
       let model = new NotebookModel();
       model.fromJSON(DEFAULT_CONTENT);
       context = new MockContext<NotebookModel>(model);

test/src/notebook/notebook/panel.spec.ts

@@ -56,7 +56,7 @@ import {
 } from '../utils';
 
 import {
-  defaultCodeMirrorRenderer, CodeMirrorRenderer
+  defaultCodeMirrorNotebookPanelRenderer, CodeMirrorNotebookPanelRenderer
 } from '../../../../lib/notebook/codemirror/notebook/panel';
 
 
@@ -94,7 +94,7 @@ class LogNotebookPanel extends NotebookPanel {
 
 
 function createPanel(): LogNotebookPanel {
-  let panel = new LogNotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorRenderer });
+  let panel = new LogNotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
   let model = new NotebookModel();
   model.fromJSON(DEFAULT_CONTENT);
   let context = new MockContext<NotebookModel>(model);
@@ -110,13 +110,13 @@ describe('notebook/notebook/panel', () => {
     describe('#constructor()', () => {
 
       it('should create a notebook panel', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
         expect(panel).to.be.a(NotebookPanel);
       });
 
 
       it('should accept an optional render', () => {
-        let renderer = new CodeMirrorRenderer();
+        let renderer = new CodeMirrorNotebookPanelRenderer();
         let panel = new NotebookPanel({ rendermime, clipboard, renderer });
         expect(panel.renderer).to.be(renderer);
       });
@@ -126,7 +126,7 @@ describe('notebook/notebook/panel', () => {
     describe('#contextChanged', () => {
 
       it('should be emitted when the context on the panel changes', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
         let called = false;
         let model = new NotebookModel();
         let context = new MockContext<INotebookModel>(model);
@@ -140,7 +140,7 @@ describe('notebook/notebook/panel', () => {
       });
 
       it('should not be emitted if the context does not change', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
         let called = false;
         let model = new NotebookModel();
         let context = new MockContext<INotebookModel>(model);
@@ -171,12 +171,12 @@ describe('notebook/notebook/panel', () => {
     describe('#toolbar', () => {
 
       it('should be the toolbar used by the widget', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
         expect(panel.toolbar).to.be.a(NotebookToolbar);
       });
 
       it('should be read-only', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
         expect(() => { panel.toolbar = null; }).to.throwError();
       });
 
@@ -185,12 +185,12 @@ describe('notebook/notebook/panel', () => {
     describe('#content', () => {
 
       it('should be the content area used by the widget', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
         expect(panel.content).to.be.a(Notebook);
       });
 
       it('should be read-only', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
         expect(() => { panel.content = null; }).to.throwError();
       });
 
@@ -206,7 +206,7 @@ describe('notebook/notebook/panel', () => {
       });
 
       it('should be read-only', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
         expect(() => { panel.kernel = null; }).to.throwError();
       });
 
@@ -215,12 +215,12 @@ describe('notebook/notebook/panel', () => {
     describe('#rendermime', () => {
 
       it('should be the rendermime instance used by the widget', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
         expect(panel.rendermime).to.be(rendermime);
       });
 
       it('should be read-only', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
         expect(() => { panel.rendermime = null; }).to.throwError();
       });
 
@@ -229,13 +229,13 @@ describe('notebook/notebook/panel', () => {
     describe('#renderer', () => {
 
       it('should be the renderer used by the widget', () => {
-        let renderer = new CodeMirrorRenderer();
+        let renderer = new CodeMirrorNotebookPanelRenderer();
         let panel = new NotebookPanel({ rendermime, clipboard, renderer });
         expect(panel.renderer).to.be(renderer);
       });
 
       it('should be read-only', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
         expect(() => { panel.renderer = null; });
       });
 
@@ -244,12 +244,12 @@ describe('notebook/notebook/panel', () => {
     describe('#clipboard', () => {
 
       it('should be the clipboard instance used by the widget', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
         expect(panel.clipboard).to.be(clipboard);
       });
 
       it('should be read-only', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
         expect(() => { panel.clipboard = null; }).to.throwError();
       });
 
@@ -258,7 +258,7 @@ describe('notebook/notebook/panel', () => {
     describe('#model', () => {
 
       it('should be the model for the widget', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
         expect(panel.model).to.be(null);
         let model = new NotebookModel();
         let context = new MockContext<NotebookModel>(model);
@@ -268,7 +268,7 @@ describe('notebook/notebook/panel', () => {
       });
 
       it('should be read-only', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
         expect(() => { panel.model = null; }).to.throwError();
       });
 
@@ -277,12 +277,12 @@ describe('notebook/notebook/panel', () => {
     describe('#context', () => {
 
       it('should get the document context for the widget', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
         expect(panel.context).to.be(null);
       });
 
       it('should set the document context for the widget', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
         let model = new NotebookModel();
         let context = new MockContext<NotebookModel>(model);
         panel.context = context;
@@ -290,7 +290,7 @@ describe('notebook/notebook/panel', () => {
       });
 
       it('should emit the `contextChanged` signal', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
         let called = false;
         let model = new NotebookModel();
         let context = new MockContext<NotebookModel>(model);
@@ -304,7 +304,7 @@ describe('notebook/notebook/panel', () => {
     describe('#dispose()', () => {
 
       it('should dispose of the resources used by the widget', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
         let model = new NotebookModel();
         let context = new MockContext<NotebookModel>(model);
         panel.context = context;
@@ -313,7 +313,7 @@ describe('notebook/notebook/panel', () => {
       });
 
       it('should be safe to call more than once', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
         panel.dispose();
         panel.dispose();
         expect(panel.isDisposed).to.be(true);
@@ -324,7 +324,7 @@ describe('notebook/notebook/panel', () => {
     describe('#onContextChanged()', () => {
 
       it('should be called when the context changes', () => {
-        let panel = new LogNotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorRenderer });
+        let panel = new LogNotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
         let model = new NotebookModel();
         let context = new MockContext<NotebookModel>(model);
         panel.methods = [];
@@ -337,7 +337,7 @@ describe('notebook/notebook/panel', () => {
     describe('#onPopulated()', () => {
 
       it('should initialize the model state', () => {
-        let panel = new LogNotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorRenderer });
+        let panel = new LogNotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
         let model = new NotebookModel();
         model.fromJSON(DEFAULT_CONTENT);
         expect(model.cells.canUndo).to.be(true);
@@ -378,7 +378,7 @@ describe('notebook/notebook/panel', () => {
       });
 
       it('should be called when the context changes', () => {
-        let panel = new LogNotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorRenderer });
+        let panel = new LogNotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
         let model = new NotebookModel();
         let context = new MockContext<NotebookModel>(model);
         panel.methods = [];
@@ -401,7 +401,7 @@ describe('notebook/notebook/panel', () => {
       describe('#createContent()', () => {
 
         it('should create a notebook widget', () => {
-          let renderer = new CodeMirrorRenderer();
+          let renderer = new CodeMirrorNotebookPanelRenderer();
           expect(renderer.createContent(rendermime)).to.be.a(Notebook);
         });
 
@@ -410,7 +410,7 @@ describe('notebook/notebook/panel', () => {
       describe('#createToolbar()', () => {
 
         it('should create a notebook toolbar', () => {
-          let renderer = new CodeMirrorRenderer();
+          let renderer = new CodeMirrorNotebookPanelRenderer();
           expect(renderer.createToolbar()).to.be.a(NotebookToolbar);
         });
 
@@ -419,7 +419,7 @@ describe('notebook/notebook/panel', () => {
       describe('#createCompletion()', () => {
 
         it('should create a completion widget', () => {
-          let renderer = new CodeMirrorRenderer();
+          let renderer = new CodeMirrorNotebookPanelRenderer();
           expect(renderer.createCompletion()).to.be.a(CompletionWidget);
         });
 
@@ -430,7 +430,7 @@ describe('notebook/notebook/panel', () => {
     describe('.defaultRenderer', () => {
 
       it('should be an instance of a `Renderer`', () => {
-        expect(defaultCodeMirrorRenderer).to.be.a(NotebookPanel.Renderer);
+        expect(defaultCodeMirrorNotebookPanelRenderer).to.be.a(NotebookPanel.Renderer);
       });
 
     });

test/src/notebook/notebook/widget.spec.ts

@@ -41,7 +41,7 @@ import {
 } from '../utils';
 
 import {
-  defaultCodeMirrorRenderer, CodeMirrorRenderer
+  defaultCodeMirrorNotebookRenderer, CodeMirrorNotebookRenderer
 } from '../../../../lib/notebook/codemirror/notebook/widget';
 
 
@@ -50,7 +50,7 @@ const rendermime = defaultRenderMime();
 
 function createWidget(): LogStaticNotebook {
   let model = new NotebookModel();
-  let widget = new LogStaticNotebook({ rendermime, renderer: defaultCodeMirrorRenderer });
+  let widget = new LogStaticNotebook({ rendermime, renderer: defaultCodeMirrorNotebookRenderer });
   widget.model = model;
   return widget;
 }
@@ -137,7 +137,7 @@ class LogNotebook extends Notebook {
 
 function createActiveWidget(): LogNotebook {
   let model = new NotebookModel();
-  let widget = new LogNotebook({ rendermime, renderer: defaultCodeMirrorRenderer });
+  let widget = new LogNotebook({ rendermime, renderer: defaultCodeMirrorNotebookRenderer });
   widget.model = model;
   return widget;
 }
@@ -150,17 +150,17 @@ describe('notebook/notebook/widget', () => {
     describe('#constructor()', () => {
 
       it('should create a notebook widget', () => {
-        let widget = new StaticNotebook({ rendermime, renderer: defaultCodeMirrorRenderer });
+        let widget = new StaticNotebook({ rendermime, renderer: defaultCodeMirrorNotebookRenderer });
         expect(widget).to.be.a(StaticNotebook);
       });
 
       it('should add the `jp-Notebook` class', () => {
-        let widget = new StaticNotebook({ rendermime, renderer: defaultCodeMirrorRenderer });
+        let widget = new StaticNotebook({ rendermime, renderer: defaultCodeMirrorNotebookRenderer });
         expect(widget.hasClass('jp-Notebook')).to.be(true);
       });
 
       it('should accept an optional render', () => {
-        let renderer = new CodeMirrorRenderer();
+        let renderer = new CodeMirrorNotebookRenderer();
         let widget = new StaticNotebook({ rendermime, renderer });
         expect(widget.renderer).to.be(renderer);
       });
@@ -170,7 +170,7 @@ describe('notebook/notebook/widget', () => {
     describe('#modelChanged', () => {
 
       it('should be emitted when the model changes', () => {
-        let widget = new StaticNotebook({ rendermime: defaultRenderMime(), renderer: defaultCodeMirrorRenderer });
+        let widget = new StaticNotebook({ rendermime: defaultRenderMime(), renderer: defaultCodeMirrorNotebookRenderer });
         let model = new NotebookModel();
         let called = false;
         widget.modelChanged.connect((sender, args) => {
@@ -187,7 +187,7 @@ describe('notebook/notebook/widget', () => {
     describe('#modelContentChanged', () => {
 
       it('should be emitted when a cell is added', () => {
-        let widget = new StaticNotebook({ rendermime: defaultRenderMime(), renderer: defaultCodeMirrorRenderer });
+        let widget = new StaticNotebook({ rendermime: defaultRenderMime(), renderer: defaultCodeMirrorNotebookRenderer });
         widget.model = new NotebookModel();
         let called = false;
         widget.modelContentChanged.connect(() => { called = true; });
@@ -197,7 +197,7 @@ describe('notebook/notebook/widget', () => {
       });
 
       it('should be emitted when metadata is set', () => {
-        let widget = new StaticNotebook({ rendermime: defaultRenderMime(), renderer: defaultCodeMirrorRenderer });
+        let widget = new StaticNotebook({ rendermime: defaultRenderMime(), renderer: defaultCodeMirrorNotebookRenderer });
         widget.model = new NotebookModel();
         let called = false;
         widget.modelContentChanged.connect(() => { called = true; });
@@ -211,19 +211,19 @@ describe('notebook/notebook/widget', () => {
     describe('#model', () => {
 
       it('should get the model for the widget', () => {
-        let widget = new StaticNotebook({ rendermime: defaultRenderMime(), renderer: defaultCodeMirrorRenderer });
+        let widget = new StaticNotebook({ rendermime: defaultRenderMime(), renderer: defaultCodeMirrorNotebookRenderer });
         expect(widget.model).to.be(null);
       });
 
       it('should set the model for the widget', () => {
-        let widget = new StaticNotebook({ rendermime: defaultRenderMime(), renderer: defaultCodeMirrorRenderer });
+        let widget = new StaticNotebook({ rendermime: defaultRenderMime(), renderer: defaultCodeMirrorNotebookRenderer });
         let model = new NotebookModel();
         widget.model = model;
         expect(widget.model).to.be(model);
       });
 
       it('should emit the `modelChanged` signal', () => {
-        let widget = new StaticNotebook({ rendermime: defaultRenderMime(), renderer: defaultCodeMirrorRenderer });
+        let widget = new StaticNotebook({ rendermime: defaultRenderMime(), renderer: defaultCodeMirrorNotebookRenderer });
         let model = new NotebookModel();
         widget.model = model;
         let called = false;
@@ -233,7 +233,7 @@ describe('notebook/notebook/widget', () => {
       });
 
       it('should be a no-op if the value does not change', () => {
-        let widget = new StaticNotebook({ rendermime: defaultRenderMime(), renderer: defaultCodeMirrorRenderer });
+        let widget = new StaticNotebook({ rendermime: defaultRenderMime(), renderer: defaultCodeMirrorNotebookRenderer });
         let model = new NotebookModel();
         widget.model = model;
         let called = false;
@@ -243,7 +243,7 @@ describe('notebook/notebook/widget', () => {
       });
 
       it('should add the model cells to the layout', () => {
-        let widget = new LogStaticNotebook({ rendermime: defaultRenderMime(), renderer: defaultCodeMirrorRenderer });
+        let widget = new LogStaticNotebook({ rendermime: defaultRenderMime(), renderer: defaultCodeMirrorNotebookRenderer });
         let model = new NotebookModel();
         model.fromJSON(DEFAULT_CONTENT);
         widget.model = model;
@@ -251,7 +251,7 @@ describe('notebook/notebook/widget', () => {
       });
 
       it('should set the mime types of the cell widgets', () => {
-        let widget = new LogStaticNotebook({ rendermime: defaultRenderMime(), renderer: defaultCodeMirrorRenderer });
+        let widget = new LogStaticNotebook({ rendermime: defaultRenderMime(), renderer: defaultCodeMirrorNotebookRenderer });
         let model = new NotebookModel();
         let cursor = model.getMetadata('language_info');
         cursor.setValue({ name: 'python', codemirror_mode: 'python' });
@@ -315,7 +315,7 @@ describe('notebook/notebook/widget', () => {
     describe('#rendermime', () => {
 
       it('should be the rendermime instance used by the widget', () => {
-        let widget = new StaticNotebook({ rendermime, renderer: defaultCodeMirrorRenderer });
+        let widget = new StaticNotebook({ rendermime, renderer: defaultCodeMirrorNotebookRenderer });
         expect(widget.rendermime).to.be(rendermime);
       });
 
@@ -329,8 +329,8 @@ describe('notebook/notebook/widget', () => {
     describe('#renderer', () => {
 
       it('should be the cell widget renderer used by the widget', () => {
-        let widget = new StaticNotebook({ rendermime, renderer: defaultCodeMirrorRenderer });
-        expect(widget.renderer).to.be(defaultCodeMirrorRenderer);
+        let widget = new StaticNotebook({ rendermime, renderer: defaultCodeMirrorNotebookRenderer });
+        expect(widget.renderer).to.be(defaultCodeMirrorNotebookRenderer);
       });
 
       it('should be read-only', () => {
@@ -343,12 +343,12 @@ describe('notebook/notebook/widget', () => {
     describe('#codeMimetype', () => {
 
       it('should get the mime type for code cells', () => {
-        let widget = new StaticNotebook({ rendermime, renderer: defaultCodeMirrorRenderer });
+        let widget = new StaticNotebook({ rendermime, renderer: defaultCodeMirrorNotebookRenderer });
         expect(widget.codeMimetype).to.be('text/plain');
       });
 
       it('should be set from language metadata', () => {
-        let widget = new LogStaticNotebook({ rendermime: defaultRenderMime(), renderer: defaultCodeMirrorRenderer });
+        let widget = new LogStaticNotebook({ rendermime: defaultRenderMime(), renderer: defaultCodeMirrorNotebookRenderer });
         let model = new NotebookModel();
         let cursor = model.getMetadata('language_info');
         cursor.setValue({ name: 'python', codemirror_mode: 'python' });
@@ -408,7 +408,7 @@ describe('notebook/notebook/widget', () => {
     describe('#onModelChanged()', () => {
 
       it('should be called when the model changes', () => {
-        let widget = new LogStaticNotebook({ rendermime, renderer: defaultCodeMirrorRenderer });
+        let widget = new LogStaticNotebook({ rendermime, renderer: defaultCodeMirrorNotebookRenderer });
         widget.model = new NotebookModel();
         expect(widget.methods).to.contain('onModelChanged');
       });
@@ -487,7 +487,7 @@ describe('notebook/notebook/widget', () => {
       describe('#createCodeCell()', () => {
 
         it('should create a `CodeCellWidget`', () => {
-          let renderer = new CodeMirrorRenderer();
+          let renderer = new CodeMirrorNotebookRenderer();
           let model = new CodeCellModel();
           let widget = renderer.createCodeCell(model, rendermime);
           expect(widget).to.be.a(CodeCellWidget);
@@ -498,7 +498,7 @@ describe('notebook/notebook/widget', () => {
       describe('#createMarkdownCell()', () => {
 
         it('should create a `MarkdownCellWidget`', () => {
-          let renderer = new CodeMirrorRenderer();
+          let renderer = new CodeMirrorNotebookRenderer();
           let model = new MarkdownCellModel();
           let widget = renderer.createMarkdownCell(model, rendermime);
           expect(widget).to.be.a(MarkdownCellWidget);
@@ -509,7 +509,7 @@ describe('notebook/notebook/widget', () => {
       describe('#createRawCell()', () => {
 
         it('should create a `RawCellWidget`', () => {
-          let renderer = new CodeMirrorRenderer();
+          let renderer = new CodeMirrorNotebookRenderer();
           let model = new RawCellModel();
           let widget = renderer.createRawCell(model);
           expect(widget).to.be.a(RawCellWidget);
@@ -520,7 +520,7 @@ describe('notebook/notebook/widget', () => {
       describe('#updateCell()', () => {
 
         it('should be a no-op', () => {
-          let renderer = new CodeMirrorRenderer();
+          let renderer = new CodeMirrorNotebookRenderer();
           let model = new CodeCellModel();
           let widget = renderer.createCodeCell(model, rendermime);
           renderer.updateCell(widget);
@@ -532,7 +532,7 @@ describe('notebook/notebook/widget', () => {
       describe('#getCodeMimetype()', () => {
 
         it('should get the preferred mime for code cells in the notebook', () => {
-          let renderer = new CodeMirrorRenderer();
+          let renderer = new CodeMirrorNotebookRenderer();
           let model = new NotebookModel();
           let cursor = model.getMetadata('language_info');
           cursor.setValue({ name: 'python', mimetype: 'text/x-python' });
@@ -546,7 +546,7 @@ describe('notebook/notebook/widget', () => {
     describe('.defaultRenderer', () => {
 
       it('should be an instance of `StaticNotebook.Renderer', () => {
-        expect(defaultCodeMirrorRenderer).to.be.a(StaticNotebook.Renderer);
+        expect(defaultCodeMirrorNotebookRenderer).to.be.a(StaticNotebook.Renderer);
       });
 
     });

test/src/notebook/notebook/widgetfactory.spec.ts

@@ -28,7 +28,7 @@ import {
 } from '../../rendermime/rendermime.spec';
 
 import {
-  defaultCodeMirrorRenderer, CodeMirrorRenderer
+  defaultCodeMirrorNotebookPanelRenderer, CodeMirrorNotebookPanelRenderer
 } from '../../../../lib/notebook/codemirror/notebook/panel';
 
 
@@ -43,7 +43,7 @@ describe('notebook/notebook/widgetfactory', () => {
     describe('#constructor()', () => {
 
       it('should create a notebook widget factory', () => {
-        let factory = new NotebookWidgetFactory(rendermime, clipboard, defaultCodeMirrorRenderer);
+        let factory = new NotebookWidgetFactory(rendermime, clipboard, defaultCodeMirrorNotebookPanelRenderer);
         expect(factory).to.be.a(NotebookWidgetFactory);
       });
 
@@ -52,14 +52,14 @@ describe('notebook/notebook/widgetfactory', () => {
     describe('#isDisposed', () => {
 
       it('should get whether the factory has been disposed', () => {
-        let factory = new NotebookWidgetFactory(rendermime, clipboard, defaultCodeMirrorRenderer);
+        let factory = new NotebookWidgetFactory(rendermime, clipboard, defaultCodeMirrorNotebookPanelRenderer);
         expect(factory.isDisposed).to.be(false);
         factory.dispose();
         expect(factory.isDisposed).to.be(true);
       });
 
       it('should be read-only', () => {
-        let factory = new NotebookWidgetFactory(rendermime, clipboard, defaultCodeMirrorRenderer);
+        let factory = new NotebookWidgetFactory(rendermime, clipboard, defaultCodeMirrorNotebookPanelRenderer);
         expect(() => { factory.isDisposed = false; }).to.throwError();
       });
 
@@ -68,13 +68,13 @@ describe('notebook/notebook/widgetfactory', () => {
     describe('#dispose()', () => {
 
       it('should dispose of the resources held by the factory', () => {
-        let factory = new NotebookWidgetFactory(rendermime, clipboard, defaultCodeMirrorRenderer);
+        let factory = new NotebookWidgetFactory(rendermime, clipboard, defaultCodeMirrorNotebookPanelRenderer);
         factory.dispose();
         expect(factory.isDisposed).to.be(true);
       });
 
       it('should be safe to call multiple times', () => {
-        let factory = new NotebookWidgetFactory(rendermime, clipboard, defaultCodeMirrorRenderer);
+        let factory = new NotebookWidgetFactory(rendermime, clipboard, defaultCodeMirrorNotebookPanelRenderer);
         factory.dispose();
         factory.dispose();
         expect(factory.isDisposed).to.be(true);
@@ -87,7 +87,7 @@ describe('notebook/notebook/widgetfactory', () => {
       it('should create a new `NotebookPanel` widget', () => {
         let model = new NotebookModel();
         let context = new MockContext<NotebookModel>(model);
-        let factory = new NotebookWidgetFactory(rendermime, clipboard, defaultCodeMirrorRenderer);
+        let factory = new NotebookWidgetFactory(rendermime, clipboard, defaultCodeMirrorNotebookPanelRenderer);
         let panel = factory.createNew(context);
         expect(panel).to.be.a(NotebookPanel);
       });
@@ -95,7 +95,7 @@ describe('notebook/notebook/widgetfactory', () => {
       it('should create a clone of the rendermime', () => {
         let model = new NotebookModel();
         let context = new MockContext<NotebookModel>(model);
-        let factory = new NotebookWidgetFactory(rendermime, clipboard, defaultCodeMirrorRenderer);
+        let factory = new NotebookWidgetFactory(rendermime, clipboard, defaultCodeMirrorNotebookPanelRenderer);
         let panel = factory.createNew(context);
         expect(panel.rendermime).to.not.be(rendermime);
       });
@@ -103,7 +103,7 @@ describe('notebook/notebook/widgetfactory', () => {
       it('should start a kernel if one is given', () => {
         let model = new NotebookModel();
         let context = new MockContext<NotebookModel>(model);
-        let factory = new NotebookWidgetFactory(rendermime, clipboard, defaultCodeMirrorRenderer);
+        let factory = new NotebookWidgetFactory(rendermime, clipboard, defaultCodeMirrorNotebookPanelRenderer);
         let panel = factory.createNew(context, { name: 'shell' });
         expect(panel.context.kernel.name).to.be('shell');
       });
@@ -111,7 +111,7 @@ describe('notebook/notebook/widgetfactory', () => {
       it('should start a kernel given the default kernel language', () => {
         let model = new NotebookModel();
         let context = new MockContext<NotebookModel>(model);
-        let factory = new NotebookWidgetFactory(rendermime, clipboard, defaultCodeMirrorRenderer);
+        let factory = new NotebookWidgetFactory(rendermime, clipboard, defaultCodeMirrorNotebookPanelRenderer);
         let panel = factory.createNew(context);
         expect(panel.context.kernel.name).to.be('python');
       });
@@ -121,7 +121,7 @@ describe('notebook/notebook/widgetfactory', () => {
         let cursor = model.getMetadata('language_info');
         cursor.setValue({ name: 'shell' });
         let context = new MockContext<NotebookModel>(model);
-        let factory = new NotebookWidgetFactory(rendermime, clipboard, defaultCodeMirrorRenderer);
+        let factory = new NotebookWidgetFactory(rendermime, clipboard, defaultCodeMirrorNotebookPanelRenderer);
         let panel = factory.createNew(context);
         expect(panel.context.kernel.name).to.be('shell');
       });
@@ -129,7 +129,7 @@ describe('notebook/notebook/widgetfactory', () => {
       it('should populate the default toolbar items', () => {
         let model = new NotebookModel();
         let context = new MockContext<NotebookModel>(model);
-        let factory = new NotebookWidgetFactory(rendermime, clipboard, defaultCodeMirrorRenderer);
+        let factory = new NotebookWidgetFactory(rendermime, clipboard, defaultCodeMirrorNotebookPanelRenderer);
         let panel = factory.createNew(context);
         let items = panel.toolbar.list();
         expect(items).to.contain('save');