handle ansi colors

DonJayamanne · DonJayamanne · commit 4f8133e3733e · 2016-09-23T10:09:19.000+10:00
diff --git a/package.json b/package.json
@@ -709,6 +709,7 @@
   "dependencies": {
     "@types/jquery": "^1.10.31",
     "@types/uuid": "^3.3.27",
+    "anser": "^1.1.0",
     "copy-paste": "^1.3.0",
     "diff-match-patch": "^1.0.0",
     "fs-extra": "^0.30.0",
diff --git a/src/client/extension.ts b/src/client/extension.ts
@@ -19,7 +19,7 @@ import * as telemetryContracts from './common/telemetryContracts';
 import {PythonCodeActionsProvider} from './providers/codeActionProvider';
 import {activateSimplePythonRefactorProvider} from './providers/simpleRefactorProvider';
 import {activateSetInterpreterProvider} from './providers/setInterpreterProvider';
-import {activateExecInTerminalProvider} from './providers/execInTerminalProvider'
+import {activateExecInTerminalProvider} from './providers/execInTerminalProvider';
 import * as tests from './unittests/main';
 import * as jup from './jupyter/main';
 
diff --git a/src/client/jupyter/main.ts b/src/client/jupyter/main.ts
@@ -2,6 +2,7 @@ import {KernelManager} from './kernel-manager';
 import {Kernel} from './kernel';
 import * as vscode from 'vscode';
 import {TextDocumentContentProvider} from './resultView';
+const anser = require('anser');
 
 const jupyterSchema = 'jupyter-result-viewer';
 let previewUri = vscode.Uri.parse(jupyterSchema + '://authority/jupyter');
@@ -87,14 +88,18 @@ export class Jupyter {
             let htmlResponse = '';
             return kernel.execute(code, (result: { type: string, stream: string, data: { [key: string]: string } | string }) => {
                 if (result.type === 'text' && result.stream === 'stdout' && typeof result.data['text/plain'] === 'string') {
-                    htmlResponse = htmlResponse + `<p><pre>${result.data['text/plain']}</pre></p>`;
+                    const htmlText = anser.ansiToHtml(anser.escapeForHtml(result.data['text/plain']));
+                    htmlResponse = htmlResponse + `<p><pre>${htmlText}</pre></p>`;
                 }
                 if (result.type === 'text' && result.stream === 'pyout' && typeof result.data['text/plain'] === 'string') {
-                    htmlResponse = htmlResponse + `<p><pre>${result.data['text/plain']}</pre></p>`;
+                    const htmlText = anser.ansiToHtml(anser.escapeForHtml(result.data['text/plain']));
+                    htmlResponse = htmlResponse + `<p><pre>${htmlText}</pre></p>`;
                 }
                 if (result.type === 'text' && result.stream === 'error' && typeof result.data['text/plain'] === 'string') {
-                    let rawError = (result.data['text/plain'] as string).replace('\n', '<br/>');
-                    htmlResponse = htmlResponse + `<p style="color:red;">${rawError}</p>`;
+                    const htmlText = anser.ansiToHtml(anser.escapeForHtml(result.data['text/plain']));
+                    let rawError = htmlText.replace('\n', '<br/>');
+                    // htmlResponse = htmlResponse + `<p style="color:black;background-color:white">${rawError}</p>`;
+                    htmlResponse = htmlResponse + `<p><pre>${rawError}</pre></p>`;
                     return resolve(htmlResponse);
                 }
                 if (result.type === 'text/html' && result.stream === 'pyout' && typeof result.data['text/html'] === 'string') {
diff --git a/typings/spawnteract.d.ts b/typings/spawnteract.d.ts
@@ -1,4 +1,4 @@
-declare module "spawnteract" {
+declare module 'spawnteract' {
     import * as child_process from 'child_process';
     interface LaunchSpecSpawnResult {
         spawn: child_process.ChildProcess;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-declare module "spawnteract" {`
	`1`	`+declare module 'spawnteract' {`
`2`	`2`	`import * as child_process from 'child_process';`
`3`	`3`	`interface LaunchSpecSpawnResult {`
`4`	`4`	`spawn: child_process.ChildProcess;`