commit aea3d91e0afe85e7fb0080421f2fb3a58465b137
Author: Daniel Swanson <popcorn.tomato.dude@gmail.com>
Date:   Fri Jul 23 14:15:05 2021 -0500

    syntax highlighting and much nicer stream diffs

diff --git a/static/regtest.css b/static/regtest.css
index 5816a98..f728b5d 100644
--- a/static/regtest.css
+++ b/static/regtest.css
@@ -2,6 +2,7 @@
 
 pre {
 	margin: 0;
+    white-space: pre-wrap;
 }
 
 .rt-table-fixed tbody {
@@ -77,19 +78,19 @@ ul.rt-gold:before {
 	margin-left: 20px;
 }
 
-.c-fst-b, .c-cg-b {
+.c-fst-b, .c-cg-b, .c-ap-l {
 	color: #880;
 }
-.c-fst-p, .c-cg-p, .c-t-t {
+.c-fst-p, .c-cg-p, .c-t-t, .c-ap-t {
 	color: #008;
 }
 .c-fst-s, .c-cg-s {
 	color: #080;
 }
-.c-fst-pl {
+.c-fst-pl, .c-ap-d {
 	color: #ccc;
 }
-.c-cg-m {
+.c-cg-m, .c-ap-u {
 	color: #800;
 }
 .c-cg-sc {
@@ -101,6 +102,9 @@ ul.rt-gold:before {
 .c-cg-t {
 	color: #44F;
 }
+.c-ap-lu {
+    white-space: nowrap;
+}
 
 code {
 	white-space: pre-wrap;
diff --git a/static/regtest.js b/static/regtest.js
index d1682ec..c2ecfe6 100644
--- a/static/regtest.js
+++ b/static/regtest.js
@@ -48,6 +48,9 @@ function detect_format(t) {
 	else if (/\S+\t[^+\s]+\+[^+\s]+/.test(t)) {
 		f = 'fst';
 	}
+    else if (/\^.*\$/.test(t)) {
+        f = 'ap';
+    }
 	return f;
 }
 
@@ -87,7 +90,7 @@ function to_plain(t, f) {
 }
 
 function hilite_output(t, f) {
-	if (!f || f === 'auto') {
+	if (!f || f === 'auto' || f === "undefined") {
 		f = detect_format(t);
 	}
 
@@ -122,10 +125,171 @@ function hilite_output(t, f) {
 	else if (f === 'transfer') {
 		t = t.replace(/(\[[^\n]+?\] \.\.\. [^\n]+)/g, '<span class="c-t-t">$1</span>');
 	}
+    else if (f == "ap") {
+        //t = t.replace(/(\^|\/)(.+?)(?=\$|\/|&lt;)/g, '<span class="c-ap-d">$1</span><span class="c-ap-l">$2</span>');
+        t = t.replace(/(\^|\/)(.+?)(?=\$|\/|&lt;)/g, function(m, d, lm) {
+            let ret = '<span class="c-ap-d">'+d+'</span><span class="c-ap-';
+            ret += (lm[0] == '*' ? 'u' : 'l');
+            ret += '">'+lm+'</span>';
+            return ret;
+        });
+        t = t.replace(/((?:&lt;\w+&gt;)+)/g, '<span class="c-ap-t">$1</span>');
+        t = t.replace(/(\$|\{)/g, '<span class="c-ap-d">$1</span>');
+    }
 
 	return t;
 }
 
+function tokenize_stream(s) {
+    let ret = [];
+    let cur = "";
+    let esc = false;
+    let word = false;
+    let blank = false;
+    let wblank = false;
+    for (let i = 0; i < s.length; i++) {
+        if (esc) {
+            esc = false;
+        } else if (s[i] == '\\') {
+            esc = true;
+        } else if (wblank) {
+            if (s[i] == ']' && i+1 < s.length && s[i+1] == ']') {
+                wblank = false;
+            }
+        } else if (blank) {
+            if (s[i] == ']') {
+                blank = false;
+            }
+        } else if (!word && s[i] == '[') {
+            blank = true;
+            if (i+1 < s.length && s[i+1] == '[') {
+                wblank = true;
+            }
+        } else if (!word && s[i] == '^' || s[i] == '}') {
+            word = true;
+            if (cur.length) {
+                ret.push(cur);
+                cur = "";
+            }
+        } else if (word && s[i] == '$' || s[i] == '{') {
+            cur += s[i];
+            ret.push(cur);
+            cur = "";
+            word = false;
+            continue;
+        }
+        cur += s[i];
+    }
+    if (cur.length) {
+        ret.push(cur);
+    }
+    return ret;
+}
+
+function tokenize_lu(s) {
+    let ret = [];
+    let cur = '';
+    let esc = false;
+    for (let i = 0; i < s.length; i++) {
+        if (esc) {
+        } else if (s[i] == '\\') {
+            esc = true;
+        } else if (s[i] == '/') {
+            ret.push(cur);
+            cur = '';
+        }
+        cur += s[i];
+    }
+    ret.push(cur);
+    return ret;
+}
+
+function diff_lus(del_obj, add_obj) {
+    if (add_obj.removed) {
+        return diff_lus(add_obj, del_obj);
+    }
+    let del = del_obj.value;
+    let add = add_obj.value;
+    let out = '';
+    for (let i = 0; i < del.length; i++) {
+        if (del[i][0] == '^' && add[i][0] == '^') {
+            out += '<span class="c-ap-lu">';
+            let arr_d = tokenize_lu(del[i]);
+            let arr_a = tokenize_lu(add[i]);
+            let diff = Diff.diffArrays(arr_d, arr_a);
+            for (let d = 0; d < diff.length; d++) {
+                if (diff[d].added) {
+                    out += '<ins>';
+                    out += esc_html(diff[d].value.join(''));
+                    out += '</ins>';
+                } else if (diff[d].removed) {
+                    out += '<del>';
+                    out += esc_html(diff[d].value.join(''));
+                    out += '</del>';
+                } else {
+                    for (let j = 0; j < diff[d].value.length; j++) {
+                        out += hilite_output(diff[d].value[j], 'ap');
+                    }
+                }
+            }
+            out += '</span>';
+        } else {
+            out += '<del>'+esc_html(del[i])+'</del>';
+            out += '<ins>'+esc_html(add[i])+'</ins>';
+        }
+    }
+    return out;
+}
+
+function diff_stream(exp, txt) {
+    let arr_e = tokenize_stream(exp);
+    let arr_t = tokenize_stream(txt);
+    let diff = Diff.diffArrays(arr_e, arr_t);
+    let output = '';
+    for (let n = 0; n < diff.length; n++) {
+        if (diff[n].added || diff[n].removed) {
+            if (n + 1 < diff.length && (diff[n+1].added || diff[n+1].removed)
+                && diff[n+1].value.length == diff[n].value.length) {
+                output += diff_lus(diff[n], diff[n+1]);
+                n++;
+            } else {
+                output += (diff[n].added ? '<ins>' : '<del>');
+                for (let n2 = 0; n2 < diff[n].value.length; n2++) {
+                    if (diff[n].value[n2][0] == '^') {
+                        output += '<span class="c-ap-lu">';
+                    }
+                    output += esc_html(diff[n].value[n2]);
+                    if (diff[n].value[n2][0] == '^') {
+                        output += '</span>';
+                    }
+                }
+                output += (diff[n].added ? '</ins>' : '</del>');
+            }
+        } else {
+            let collapse = -1;
+            if (diff[n].value.length > 15) {
+                collapse = diff[n].value.length - 3;
+            }
+            for (let n2 = 0; n2 < diff[n].value.length; n2++) {
+                if (diff[n].value[n2][0] == '^') {
+                    output += '<span class="c-ap-lu">';
+                }
+                output += hilite_output(esc_html(diff[n].value[n2]), 'ap');
+                if (diff[n].value[n2][0] == '^') {
+                    output += '</span>';
+                }
+                if (collapse != -1 && n2 == 2) {
+                    output += '<div class="rt-expansion"><span class="rt-expanded">';
+                }
+                else if (n2 == collapse) {
+                    output += '</span><button tabindex="-1" type="button" class="btn btn-outline-secondary btn-sm btnExpand">…</button><button tabindex="-1" type="button" class="btn btn-outline-secondary btn-sm btnCollapse">…</button></div>';
+                }
+            }
+        }
+    }
+    return output;
+}
+
 function ajax_fail(e) {
 	console.log(e);
 	if (e.hasOwnProperty('responseJSON')) {
@@ -376,31 +540,39 @@ function btn_show_tab() {
 	let type = div.attr('data-type');
 	let text = div.attr('data-output');
 	let expect = div.attr('data-expect');
+    if (!type || type === 'auto' || type === 'undefined') {
+        type = detect_format(text);
+    }
 
 	if (expect) {
-		let diff = Diff.diffWordsWithSpace(expect, text);
-		let output = '';
-		for (let d=0 ; d<diff.length ; ++d) {
-			if (diff[d].added) {
-				output += '<ins>'+esc_html(diff[d].value)+'</ins>';
-			}
-			else if (diff[d].removed) {
-				output += '<del>'+esc_html(diff[d].value)+'</del>';
-			}
-			else {
-				let val = esc_html(diff[d].value);
-				if (/\n([^\n]+\n){6}/.test(val)) {
-					let ls = val.split("\n");
-					val = hilite_output(ls[0]+"\n"+ls[1]+"\n"+ls[2]+"\n", type);
-					val += '<div class="rt-expansion"><span class="rt-expanded">'+hilite_output(ls.slice(3, -3).join("\n"), type)+'</span><button tabindex="-1" type="button" class="btn btn-outline-secondary btn-sm btnExpand">…</button><button tabindex="-1" type="button" class="btn btn-outline-secondary btn-sm btnCollapse">…</button></div>';
-					val += hilite_output(ls[ls.length-3]+"\n"+ls[ls.length-2]+"\n"+ls[ls.length-1], type);
-				}
-				else {
-					val = hilite_output(val, type);
-				}
+        let output = '';
+        if (type === 'ap') {
+            output = diff_stream(expect, text);
+        } else {
+		    let diff = Diff.diffWordsWithSpace(expect, text);
+		    let output = '';
+		    for (let d=0 ; d<diff.length ; ++d) {
+			    if (diff[d].added) {
+				    output += '<ins>'+esc_html(diff[d].value)+'</ins>';
+			    }
+			    else if (diff[d].removed) {
+				    output += '<del>'+esc_html(diff[d].value)+'</del>';
+			    }
+			    else {
+				    let val = esc_html(diff[d].value);
+				    if (/\n([^\n]+\n){6}/.test(val)) {
+					    let ls = val.split("\n");
+					    val = hilite_output(ls[0]+"\n"+ls[1]+"\n"+ls[2]+"\n", type);
+					    val += '<div class="rt-expansion"><span class="rt-expanded">'+hilite_output(ls.slice(3, -3).join("\n"), type)+'</span><button tabindex="-1" type="button" class="btn btn-outline-secondary btn-sm btnExpand">…</button><button tabindex="-1" type="button" class="btn btn-outline-secondary btn-sm btnCollapse">…</button></div>';
+					    val += hilite_output(ls[ls.length-3]+"\n"+ls[ls.length-2]+"\n"+ls[ls.length-1], type);
+				    }
+				    else {
+					    val = hilite_output(val, type);
+				    }
 				output += val;
-			}
-		}
+			    }
+		    }
+        }
         $(div).find('pre').html(output);
 		div.removeAttr('data-expect');
 		div.find('.rt-expanded').hide();