Merge pull request #6653 from mattpap/fix_ansispan

Fix IPython.utils.ansispan() to ignore stray [0m

IPython/html/tests/base/utils.js

@@ -0,0 +1,23 b''
+casper.notebook_test(function () {
+    var input = [
+        "\033[0m[\033[0minfo\033[0m] \033[0mtext\033[0m",
+        "\033[0m[\033[33mwarn\033[0m] \033[0m\tmore text\033[0m",
+        "\033[0m[\033[33mwarn\033[0m] \033[0m  https://some/url/to/a/file.ext\033[0m",
+        "\033[0m[\033[31merror\033[0m] \033[0m\033[0m",
+        "\033[0m[\033[31merror\033[0m] \033[0m\teven more text\033[0m",
+        "\033[0m[\033[31merror\033[0m] \033[0m\t\tand more more text\033[0m"].join("\n");
+
+    var output = [
+        "[info] text",
+        "[<span  class=\"ansiyellow\">warn</span>] \tmore text",
+        "[<span  class=\"ansiyellow\">warn</span>]   https://some/url/to/a/file.ext",
+        "[<span  class=\"ansired\">error</span>] ",
+        "[<span  class=\"ansired\">error</span>] \teven more text",
+        "[<span  class=\"ansired\">error</span>] \t\tand more more text"].join("\n");
+
+    var result = this.evaluate(function (input) {
+        return IPython.utils.fixConsole(input);
+    }, input);
+
+    this.test.assertEquals(result, output, "IPython.utils.fixConsole() handles [0m correctly");
+});

IPython/html/static/base/js/utils.js

@@ -285,27 +285,36 b' define(['
     function ansispan(str) {
         // ansispan function adapted from github.com/mmalecki/ansispan (MIT License)
         // regular ansi escapes (using the table above)
+        var is_open = false
         return str.replace(/\033\[(0?[01]|22|39)?([;\d]+)?m/g, function(match, prefix, pattern) {
             if (!pattern) {
                 // [(01|22|39|)m close spans
-                return "</span>";
-            }
-            // consume sequence of color escapes
-            var numbers = pattern.match(/\d+/g);
-            var attrs = {};
-            while (numbers.length > 0) {
-                _process_numbers(attrs, numbers);
-            }
-            
-            var span = "<span ";
-            for (var attr in attrs) {
-                var value = attrs[attr];
-                span = span + " " + attr + '="' + attrs[attr] + '"';
+                if (is_open) {
+                    is_open = false;
+                    return "</span>";
+                } else {
+                    return "";
+                }
+            } else {
+                is_open = true;
+
+                // consume sequence of color escapes
+                var numbers = pattern.match(/\d+/g);
+                var attrs = {};
+                while (numbers.length > 0) {
+                    _process_numbers(attrs, numbers);
+                }
+
+                var span = "<span ";
+                for (var attr in attrs) {
+                    var value = attrs[attr];
+                    span = span + " " + attr + '="' + attrs[attr] + '"';
+                }
+                return span + ">";
             }
-            return span + ">";
         });
     };
-    
+
     // Transform ANSI color escape codes into HTML <span> tags with css
     // classes listed in the above ansi_colormap object. The actual color used
     // are set in the css file.

IPython/html/static/notebook/less/ansicolors.less

@@ -1,13 +1,12 b''
 /* CSS font colors for translated ANSI colors. */
 
-
 .ansibold {font-weight: bold;}
 
 /* use dark versions for foreground, to improve visibility */
 .ansiblack {color: black;}
 .ansired {color: darkred;}
 .ansigreen {color: darkgreen;}
-.ansiyellow {color: brown;}
+.ansiyellow {color: #c4a000;}
 .ansiblue {color: darkblue;}
 .ansipurple {color: darkviolet;}
 .ansicyan {color: steelblue;}
@@ -22,4 +21,3 b''
 .ansibgpurple {background-color: magenta;}
 .ansibgcyan {background-color: cyan;}
 .ansibggray {background-color: gray;}
-

IPython/html/static/style/ipython.min.css

@@ -294,7 +294,7 b' div.traceback-wrapper {'
   color: darkgreen;
 }
 .ansiyellow {
-  color: brown;
+  color: #c4a000;
 }
 .ansiblue {
   color: darkblue;

IPython/html/static/style/style.min.css

@@ -8163,7 +8163,7 b' input.engine_num_input {'
   color: darkgreen;
 }
 .ansiyellow {
-  color: brown;
+  color: #c4a000;
 }
 .ansiblue {
   color: darkblue;