Update other uses of options

packages/cells/src/widget.ts

@@ -301,7 +301,7 @@ class Cell extends Widget {
       return;
     }
     // Handle read only state.
-    this.editor.readOnly = this._readOnly;
+    this.editor.setOption('readOnly', this._readOnly);
     this.toggleClass(READONLY_CLASS, this._readOnly);
   }
 
@@ -480,7 +480,7 @@ class CodeCell extends Cell {
     let model = this.model;
 
     // Code cells should not wrap lines.
-    this.editor.wordWrap = false;
+    this.editor.setOption('wordWrap', false);
 
     // Insert the output before the cell footer.
     let outputWrapper = this._outputWrapper = new Panel();
@@ -670,7 +670,7 @@ class MarkdownCell extends Cell {
     super(options);
     this.addClass(MARKDOWN_CELL_CLASS);
     this._rendermime = options.rendermime;
-    this.editor.wordWrap = true;
+    this.editor.setOption('wordWrap', true);
 
     // Throttle the rendering rate of the widget.
     this._monitor = new ActivityMonitor({

packages/fileeditor-extension/src/index.ts

@@ -123,8 +123,8 @@ function activate(app: JupyterLab, registry: IDocumentRegistry, restorer: ILayou
    */
   function updateTracker(): void {
     tracker.forEach(widget => {
-      widget.editor.lineNumbers = lineNumbers;
-      widget.editor.wordWrap = wordWrap;
+      widget.editor.setOption('lineNumbers', lineNumbers);
+      widget.editor.setOption('wordWrap', wordWrap);
     });
   }
 
@@ -144,22 +144,24 @@ function activate(app: JupyterLab, registry: IDocumentRegistry, restorer: ILayou
     // Notify the instance tracker if restore data needs to update.
     widget.context.pathChanged.connect(() => { tracker.save(widget); });
     tracker.add(widget);
-    widget.editor.lineNumbers = lineNumbers;
-    widget.editor.wordWrap = wordWrap;
+    widget.editor.setOption('lineNumbers', lineNumbers);
+    widget.editor.setOption('wordWrap', wordWrap);
   });
   registry.addWidgetFactory(factory);
 
   // Handle the settings of new widgets.
   tracker.widgetAdded.connect((sender, widget) => {
     const editor = widget.editor;
-    editor.lineNumbers = lineNumbers;
-    editor.wordWrap = wordWrap;
+    editor.setOption('lineNumbers', lineNumbers);
+    editor.setOption('wordWrap', wordWrap);
   });
 
   commands.addCommand(CommandIDs.lineNumbers, {
     execute: () => {
       lineNumbers = !lineNumbers;
-      tracker.forEach(widget => { widget.editor.lineNumbers = lineNumbers; });
+      tracker.forEach(widget => {
+        widget.editor.setOption('lineNumbers', lineNumbers);
+      });
       return settingRegistry.set(id, 'lineNumbers', lineNumbers);
     },
     isEnabled: hasWidget,
@@ -170,7 +172,9 @@ function activate(app: JupyterLab, registry: IDocumentRegistry, restorer: ILayou
   commands.addCommand(CommandIDs.wordWrap, {
     execute: () => {
       wordWrap = !wordWrap;
-      tracker.forEach(widget => { widget.editor.wordWrap = wordWrap; });
+      tracker.forEach(widget => {
+        widget.editor.setOption('wordWrap', wordWrap);
+      });
       return settingRegistry.set(id, 'wordWrap', wordWrap);
     },
     isEnabled: hasWidget,

packages/fileeditor/src/widget.ts

@@ -207,9 +207,6 @@ class FileEditorFactory extends ABCWidgetFactory<FileEditor, DocumentRegistry.IC
     let func = this._services.factoryService.newDocumentEditor.bind(
       this._services.factoryService);
     let factory: CodeEditor.Factory = options => {
-      options.lineNumbers = true;
-      options.readOnly = false;
-      options.wordWrap = true;
       return func(options);
     };
     return new FileEditor({

packages/notebook/src/actions.ts

@@ -702,10 +702,10 @@ namespace NotebookActions {
       return;
     }
     let state = Private.getState(widget);
-    let lineNumbers = widget.activeCell.editor.lineNumbers;
+    let lineNumbers = widget.activeCell.editor.getOption('lineNumbers');
     each(widget.widgets, child => {
       if (widget.isSelected(child)) {
-        child.editor.lineNumbers = !lineNumbers;
+        child.editor.setOption('lineNumbers', !lineNumbers);
       }
     });
     Private.handleState(widget, state);
@@ -726,9 +726,9 @@ namespace NotebookActions {
       return;
     }
     let state = Private.getState(widget);
-    let lineNumbers = widget.activeCell.editor.lineNumbers;
+    let lineNumbers = widget.activeCell.editor.getOption('lineNumbers');
     each(widget.widgets, child => {
-      child.editor.lineNumbers = !lineNumbers;
+      child.editor.setOption('lineNumbers', !lineNumbers);
     });
     Private.handleState(widget, state);
   }

packages/notebook/src/celltools.ts

@@ -363,7 +363,7 @@ namespace CellTools {
       let editorWidget = new CodeEditorWrapper({ model, factory });
       editorWidget.addClass('jp-InputArea-editor');
       editorWidget.addClass('jp-InputArea-editor');
-      editorWidget.editor.readOnly = true;
+      editorWidget.editor.setOption('readOnly', true);
       layout.addWidget(prompt);
       layout.addWidget(editorWidget);
     }