switch to ansi_up, better ansi->HTML conversions

lib/console/view.coffee

@@ -1,7 +1,6 @@
 ResizeDetector = require 'element-resize-detector'
-AnsiConverter = require 'ansi-to-html'
+ansiToHTML = require '../util/ansitohtml'
 {throttle, delay} = require 'underscore-plus'
-converter = new AnsiConverter()
 
 class ConsoleElement extends HTMLElement
   createdCallback: ->
@@ -169,7 +168,7 @@ class ConsoleElement extends HTMLElement
     out = document.createElement 'div'
     item.ansi = ansi
     out.innerText = item.text
-    out.innerHTML = converter.toHtml(out.innerHTML) if ansi
+    out.innerHTML = ansiToHTML(out.innerHTML) if ansi
     out.classList.add type, 'stream'
     out
 

lib/editor/result-view.js

@@ -1,10 +1,9 @@
 'use babel'
 import { CompositeDisposable } from 'atom'
-import AnsiConverter from 'ansi-to-html'
 import views from '../util/views'
+import ansiToHTML from '../util/ansitohtml'
 
 let { span, div } = views.tags
-let converter = new AnsiConverter()
 
 export default class ResultView {
   constructor (model, opts = {}) {
@@ -105,16 +104,7 @@ export default class ResultView {
     error ? this.view.classList.add('error') : this.view.classList.remove('error')
     loading ? this.view.classList.add('loading') : this.view.classList.remove('loading')
 
-    if (view.childElementCount == 0) {
-      view.innerHTML = converter.toHtml(view.innerHTML)
-    } else if (view.getElementsByTagName) {
-      let allNodes = view.getElementsByTagName('*')
-      for (let i = -1, l = allNodes.length; ++i < l;) {
-        if (allNodes[i].childElementCount == 0) {
-          allNodes[i].innerHTML = converter.toHtml(allNodes[i].innerHTML)
-        }
-      }
-    }
+    ansiToHTML(view)
 
     this.view.appendChild(view)
 

lib/ink.coffee

@@ -62,3 +62,4 @@ module.exports = Ink =
     InkTerminal: InkTerminal
     Linter: Linter
     matchHighlighter: require './util/matchHighlighter'
+    ansiToHTML: require './util/ansitohtml'

lib/util/ansitohtml.js

@@ -0,0 +1,18 @@
+'use babel'
+
+import AnsiUp from 'ansi_up'
+let converter = new AnsiUp()
+
+export default function ansiToHTML (view) {
+  if (view.childElementCount == 0) {
+    view.innerHTML = converter.ansi_to_html(view.innerHTML)
+  } else if (view.querySelectorAll) {
+    let allNodes = view.querySelectorAll  ('*')
+    for (let i = -1, l = allNodes.length; ++i < l;) {
+      if (allNodes[i].childElementCount == 0) {
+        allNodes[i].innerHTML = converter.ansi_to_html(allNodes[i].innerHTML)
+      }
+    }
+  }
+  return view
+}

package.json

@@ -10,7 +10,7 @@
     "atom": ">=1.12.0 <2.0.0"
   },
   "dependencies": {
-    "ansi-to-html": "^0.6.3",
+    "ansi_up": "^3.0.0",
     "atom-space-pen-views": "^2.0.0",
     "fuzzaldrin-plus": "^0.1.0",
     "underscore-plus": "^1.6.6",