named export

views in ui already fixed in the other PR

Author: aminya

lib/ui/docs.js

@@ -2,7 +2,7 @@
 
 import { CompositeDisposable } from 'atom'
 import { client } from '../connection'
-const views = require('./views')
+import * as views from './views'
 import goto from '../runtime/goto'
 
 const {

lib/ui/views.js

@@ -5,9 +5,8 @@ import { once } from '../misc';
 
 const getlazy = client.import('getlazy');
 
-let views;
-export default views = {
-  dom({tag, attrs, contents}, opts) {
+
+export function dom({tag, attrs, contents}, opts) {
     const view = document.createElement(tag);
     for (let k in attrs) {
       let v = attrs[k];
@@ -19,65 +18,65 @@ export default views = {
         contents = [contents];
       }
       for (let child of contents) {
-        view.appendChild(this.render(child, opts));
+        view.appendChild(render(child, opts));
       }
     }
     return view;
-  },
+}
 
-  html(...args) {
+export function html(...args) {
     const obj = args[0],
       {
         content
       } = obj,
       val = obj.block,
       block = val != null ? val : false;
-    let view = this.render(block ? this.tags.div() : this.tags.span());
+    let view = render(block ? tags.div() : tags.span());
     view.innerHTML = content;
     return view = view.children.length === 1 ? view.children[0] : view;
-  },
+}
 
-  tree({head, children, expand}, opts) {
-    this.ink.tree.treeView(this.render(head, opts),
-      children.map(x=> this.render(this.tags.div([x]), opts)),
+export function tree({head, children, expand}, opts) {
+    this.ink.tree.treeView(render(head, opts),
+      children.map(x=> render(tags.div([x]), opts)),
       {expand});
-  },
+}
 
-  lazy({head, id}, opts) {
+export function lazy({head, id}, opts) {
     const conn = client.conn;
     if (opts.registerLazy != null) {
       opts.registerLazy(id);
     } else {
       console.warn('Unregistered lazy view');
     }
     let view;
-    return view = this.ink.tree.treeView(this.render(head, opts), [], {
+    return view = this.ink.tree.treeView(render(head, opts), [], {
         onToggle: once(() => {
           if (client.conn !== conn) { return; }
           getlazy(id).then(children => {
             const body = view.querySelector(':scope > .body');
-            children.map(x => this.render(this.tags.div([x]), opts)).forEach(x => {
+            children.map(x => render(tags.div([x]), opts)).forEach(x => {
               body.appendChild(this.ink.ansiToHTML(x));
             });
           });
         })
       }
     );
-  },
+}
 
-  subtree({label, child}, opts) {
-    return this.render((child.type === "tree" ?{
+export function subtree({label, child}, opts) {
+    return render((child.type === "tree" ?{
         type: "tree",
-        head: this.tags.span([label, child.head]),
+        head: tags.span([label, child.head]),
         children: child.children
       }
       // children: child.children.map((x) => @tags.span "gutted", x)
       :
-      this.tags.span("gutted", [label, child])), opts);
-  },
+      tags.span("gutted", [label, child])), opts);
+}
 
-  copy({view, text}, opts) {
-    view = this.render(view, opts);
+export function copy({view, text}, opts) {
+    view = render(view, opts);
     atom.commands.add(view, {
         'core:copy'(e) {
           atom.clipboard.write(text);
@@ -86,10 +85,10 @@ export default views = {
       }
     );
     return view;
-  },
+}
 
-  link({file, line, contents}) {
-    const view = this.render(this.tags.a({href: '#'}, contents));
+export function link({file, line, contents}) {
+    const view = render(tags.a({href: '#'}, contents));
     // TODO: maybe need to dispose of the tooltip onclick and readd them, but
     // that doesn't seem to be necessary
     let tt;
@@ -108,35 +107,35 @@ export default views = {
       tt.dispose();
     });
     return view;
-  },
+}
 
-  number({value, full}) {
+export function number({value, full}) {
     let rounded = value.toPrecision(3);
     if (rounded.toString().length < full.length) { rounded += '…'; }
-    const view = this.render(this.tags.span('syntax--constant syntax--numeric', rounded));
+    const view = render(tags.span('syntax--constant syntax--numeric', rounded));
     let isfull = false;
     view.onclick = function(e) {
       view.innerText = !isfull ? full : rounded;
       isfull = !isfull;
       e.stopPropagation();
     };
     return view;
-  },
+}
 
-  code({text, attrs, scope}) {
+export function code({text, attrs, scope}) {
     const grammar = atom.grammars.grammarForScopeName("source.julia");
     const block = (attrs != null ? attrs.block : undefined) || false; // attrs?.block || false
     const highlighted = Highlighter.highlight(text, grammar, {scopePrefix: 'syntax--', block});
-    return this.render({type: 'html', block, content: highlighted});
-  },
+    return render({type: 'html', block, content: highlighted});
+}
 
-  latex({attrs, text}) {
+export function latex({attrs, text}) {
     const block = (attrs != null ? attrs.block : undefined) || false; // attrs?.block || false
     const latex = this.ink.KaTeX.texify(text, block);
-    return this.render({type: 'html', block, content: latex});
-  },
+    return render({type: 'html', block, content: latex});
+}
 
-  views: {
+export const views = {
     // TODO Remove unnecessary use of Array.from
     dom(...a) { return views.dom(...Array.from(a || [])); },
     html(...a) { return views.html(...Array.from(a || [])); },
@@ -148,21 +147,21 @@ export default views = {
     number(...a) { return views.number(...Array.from(a || [])); },
     code(...a) { return views.code(...Array.from(a || [])); },
     latex(...a) { return views.latex(...Array.from(a || [])); }
-  },
+}
 
-  render(data, opts = {}) {
-    if (this.views.hasOwnProperty(data.type)) {
-      const r = this.views[data.type](data, opts);
+export function render(data, opts = {}) {
+    if (views.hasOwnProperty(data.type)) {
+      const r = views[data.type](data, opts);
       this.ink.ansiToHTML(r);
       return r;
     } else if ((data != null ? data.constructor : undefined) === String) { // data?.constructor === String
       return new Text(data);
     } else {
-      return this.render(`julia-client: can't render ${(data != null ? data.type : undefined)}`); // data?.type
+      return render(`julia-client: can't render ${(data != null ? data.type : undefined)}`); // data?.type
     }
-  },
+}
 
-  tag(tag, attrs, contents) {
+export function tag(tag, attrs, contents) {
     if ((attrs != null ? attrs.constructor : undefined) === String) { // attrs?.constructor === String
       attrs = {class: attrs};
     }
@@ -175,9 +174,10 @@ export default views = {
       attrs,
       contents
     };
-  },
-
-  tags: {}
-};
+}
 
-['div', 'span', 'a', 'strong', 'table', 'tr', 'td', 'webview'].forEach(tag => views.tags[tag] = (attrs, contents) => views.tag(tag, attrs, contents));
+export let tags = {}
+const tags_arr = ['div', 'span', 'a', 'strong', 'table', 'tr', 'td', 'webview']
+for (let _tag of tags_arr) {
+  tags[_tag] = (attrs, contents) => tag(_tag, attrs, contents)
+}