Fixing dynamic requires

Author: aminya

lib/runtime.js

@@ -5,12 +5,12 @@ import { CompositeDisposable, Disposable } from 'atom';
 import modules from './runtime/modules'
 import * as environments from './runtime/environments'
 import evaluation from './runtime/evaluation'
-import * as console from './runtime/console'
+import * as repl from './runtime/console'   // console is a is a reserved keyword
 import completions from './runtime/completions'
 import workspace from './runtime/workspace'
 import plots from './runtime/plots'
 import * as frontend from './runtime/frontend'
-import * as debug from './runtime/debugger'
+import * as debug from './runtime/debugger'  // debugger is a is a reserved keyword
 import * as profiler from './runtime/profiler'
 import * as outline from './runtime/outline'
 import * as linter from './runtime/linter'
@@ -20,88 +20,87 @@ import * as formatter from './runtime/formatter'
 import goto from './runtime/goto'
 import handleURI from "./runtime/urihandler";
 
+exports.modules = modules
+exports.environments = environments
+exports.evaluation = evaluation
+exports.repl = repl
+exports.completions = completions
+exports.workspace = workspace
+exports.plots = plots
+exports.frontend = frontend
+exports.debug = debug
+exports.profiler = profiler
+exports.outline = outline
+exports.linter = linter
+exports.packages = packages
+exports.debuginfo = debuginfo
+exports.formatter = formatter
+exports.goto = goto
+exports.handleURI = handleURI
 
-export default {
-  // TODO remove these from the export default and export them directly (prevents expensive copy)
-  // TODO don't use this.message use message directly (prevents expensive copy)
-  modules:      modules,
-  environments: environments,
-  evaluation:   evaluation,
-  console:      console,
-  completions:  completions,
-  workspace:    workspace,
-  plots:        plots,
-  frontend:     frontend,
-  debugger:     debug,
-  profiler:     profiler,
-  outline:      outline,
-  linter:       linter,
-  packages:     packages,
-  debuginfo:    debuginfo,
-  formatter:    formatter,
-  goto:         goto,
+let subs;
 
-  activate() {
-    this.subs = new CompositeDisposable();
+export function activate() {
+    subs = new CompositeDisposable();
 
-    this.modules.activate();
-    this.completions.activate();
-    this.subs.add(atom.config.observe('julia-client.juliaOptions.formatOnSave', val => {
+    modules.activate();
+    completions.activate();
+    subs.add(atom.config.observe('julia-client.juliaOptions.formatOnSave', val => {
         if (val) {
-          this.formatter.activate();
+          formatter.activate();
         } else {
-          this.formatter.deactivate();
+          formatter.deactivate();
         }
       })
     );
 
-    this.subs.add(new Disposable(() => {
-        [this.modules, this.completions, this.formatter].map((mod) => mod.deactivate());
+    subs.add(new Disposable(() => {
+        [modules, completions, formatter].map((mod) => mod.deactivate());
       })
     );
-  },
+}
 
-  deactivate() {
-    this.subs.dispose();
-  },
+export function deactivate() {
+    subs.dispose();
+}
 
-  consumeInk(ink) {
-    this.evaluation.ink = ink;
-    for (let mod of [this.console, this.debugger, this.profiler, this.linter, this.goto, this.outline, this.frontend]) {
+export function consumeInk(ink) {
+    evaluation.ink = ink;
+    for (let mod of [repl, debug, profiler, linter, goto, outline, frontend]) {
       mod.activate(ink);
     }
-    for (let mod of [this.workspace, this.plots]) {
+    for (let mod of [workspace, plots]) {
       mod.ink = ink;
       mod.activate();
     }
 
-    this.subs.add(
+    subs.add(
       new Disposable(() => {
-        for (let mod of [this.console, this.debugger, this.profiler, this.linter, this.goto, this.outline]) {
+        for (let mod of [repl, debug, profiler, linter, goto, outline]) {
           mod.deactivate();
         }
       })
     );
 
-    this.environments.consumeInk(ink);
-  },
+    environments.consumeInk(ink);
+}
 
-  provideAutoComplete() { return this.completions; },
+export function provideAutoComplete() { return completions; }
 
-  provideHyperclick() { return this.goto.provideHyperclick(); },
+export function provideHyperclick() { return goto.provideHyperclick(); }
 
-  consumeStatusBar(bar) {
-    const m = this.modules.consumeStatusBar(bar);
-    const e = this.environments.consumeStatusBar(bar);
+export function consumeStatusBar(bar) {
+    const m = modules.consumeStatusBar(bar);
+    const e = environments.consumeStatusBar(bar);
     const d = new Disposable(() => {
       m.dispose();
       e.dispose();
     });
-    this.subs.add(d);
+    subs.add(d);
     return d;
-  },
+}
 
-  consumeDatatip(datatipService) {
+export function consumeDatatip(datatipService) {
     const datatipProvider = require('./runtime/datatip');
     // @NOTE: Check if the service is passed by Atom-IDE-UI's datatip service:
     //          currently atom-ide-datatip can't render code snippets correctly.
@@ -116,9 +115,7 @@ export default {
       );
     }
     const datatipDisposable = datatipService.addProvider(datatipProvider);
-    this.subs.add(datatipDisposable);
+    subs.add(datatipDisposable);
     return datatipDisposable;
-  },
+}
 
-  handleURI: handleURI,
-};

lib/ui/layout.js

@@ -1,26 +1,17 @@
 'use babel'
 
-const repl = () => {
-  return require('../runtime').console
-}
-const workspace = () => {
-  return require('../runtime').workspace
-}
+import {
+  repl,
+  workspace,
+  plots as plotPane,
+  debug as debuggerPane,
+  linter,
+  outline
+} from '../runtime'
+
 const documentation = () => {
   return require('../ui').docpane
 }
-const plotPane = () => {
-  return require('../runtime').plots
-}
-const debuggerPane = () => {
-  return require('../runtime').debugger
-}
-const linter = () => {
-  return require('../runtime').linter
-}
-const outline = () => {
-  return require('../runtime').outline
-}
 
 function specifiedPanes () {
   const panes = []