Add a default services export and update apis

examples/console/src/index.ts

@@ -26,12 +26,12 @@ import {
 } from '@jupyterlab/services';
 
 import {
-  ConsolePanel
-} from 'jupyterlab/lib/console';
+  editorServices
+} from 'jupyterlab/lib/codemirror';
 
 import {
-  createRenderer
-} from 'jupyterlab/lib/console/codemirror';
+  ConsolePanel, ConsoleContent
+} from 'jupyterlab/lib/console';
 
 import {
   RenderMime
@@ -107,7 +107,7 @@ function startApp(session: Session.ISession) {
   }
   let sanitizer = defaultSanitizer;
   let rendermime = new RenderMime({ renderers, order, sanitizer });
-  let renderer = createRenderer();
+  let renderer = new ConsoleContent.Renderer({ editorServices });
 
   let consolePanel = new ConsolePanel({ session, renderer, rendermime });
   consolePanel.title.label = TITLE;

examples/lab/index.js

@@ -16,8 +16,8 @@ lab.registerPlugins([
   require('jupyterlab/lib/about/plugin').plugin,
   require('jupyterlab/lib/application/plugin').plugin,
   require('jupyterlab/lib/clipboard/plugin').plugin,
-  require('jupyterlab/lib/codemirror/plugin').editorServices,
-  require('jupyterlab/lib/codemirror/plugin').editorCommands,
+  require('jupyterlab/lib/codemirror/plugin').servicesPlugin,
+  require('jupyterlab/lib/codemirror/plugin').commandsPlugin,
   require('jupyterlab/lib/commandlinker/plugin').plugin,
   require('jupyterlab/lib/commandpalette/plugin').plugin,
   require('jupyterlab/lib/console/plugin').plugin,

jupyterlab/src/extensions.ts

@@ -5,8 +5,8 @@ module.exports = [
   require('../../lib/about/plugin').plugin,
   require('../../lib/application/plugin').plugin,
   require('../../lib/clipboard/plugin').plugin,
-  require('../../lib/codemirror/plugin').editorServices,
-  require('../../lib/codemirror/plugin').editorCommands,
+  require('../../lib/codemirror/plugin').servicesPlugin,
+  require('../../lib/codemirror/plugin').commandsPlugin,
   require('../../lib/commandlinker/plugin').plugin,
   require('../../lib/commandpalette/plugin').plugin,
   require('../../lib/console/plugin').plugin,

src/codemirror/index.ts

@@ -1,8 +1,30 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
+import {
+  IEditorServices
+} from '../codeeditor';
+
+import {
+  CodeMirrorEditorFactory
+} from './factory';
+
+import {
+  CodeMirrorMimeTypeService
+} from './mimetype';
+
 export * from './mode';
 export * from './model';
 export * from './editor';
 export * from './factory';
 export * from './mimetype';
+
+
+/**
+ * The default editor services.
+ */
+export
+const editorServices: IEditorServices = {
+  factory: new CodeMirrorEditorFactory(),
+  mimeTypeService: new CodeMirrorMimeTypeService()
+};

src/codemirror/plugin.ts

@@ -31,7 +31,7 @@ import {
 } from '../mainmenu';
 
 import {
-  CodeMirrorEditorFactory, CodeMirrorMimeTypeService, CodeMirrorEditor, DEFAULT_CODEMIRROR_THEME
+  editorServices, CodeMirrorEditor, DEFAULT_CODEMIRROR_THEME
 } from '.';
 
 
@@ -39,14 +39,10 @@ import {
  * The editor services.
  */
 export
-const editorServices: JupyterLabPlugin<IEditorServices> = {
+const servicesPlugin: JupyterLabPlugin<IEditorServices> = {
   id: IEditorServices.name,
   provides: IEditorServices,
-  activate: (): IEditorServices => {
-    const factory = new CodeMirrorEditorFactory();
-    const mimeTypeService = new CodeMirrorMimeTypeService();
-    return { factory, mimeTypeService };
-  }
+  activate: (): IEditorServices => editorServices
 };
 
 
@@ -54,7 +50,7 @@ const editorServices: JupyterLabPlugin<IEditorServices> = {
  * The editor commands.
  */
 export
-const editorCommands: JupyterLabPlugin<void> = {
+const commandsPlugin: JupyterLabPlugin<void> = {
   id: 'jupyter.services.editor-commands',
   requires: [IEditorTracker, IMainMenu, ICommandPalette],
   activate: activateEditorCommands,