Pass through context information in error messages

lib/runtime/messages_widget.js

Index: lib/runtime/messages_widget.js
diff --git a/lib/runtime/messages_widget.js b/lib/runtime/messages_widget.js
index e8330020774f1b1d47ad8f50e8dbcefeeaf50e1a..b1362f5d37c522be5a05604107ad11eb0ede7bad 100644
--- a/lib/runtime/messages_widget.js
+++ b/lib/runtime/messages_widget.js
@@ -1,4 +1,4 @@
-// Generated by dart2js, the Dart to JavaScript compiler version: 1.9.0-dev.10.3.
+// Generated by dart2js, the Dart to JavaScript compiler version: 1.9.0-dev.10.13.
 (function($){
 function map(a){a=Object.create(null)
 a.x=0
@@ -351,6 +351,17 @@ Vr:function(a,b){var z,y
 z=a.length
 for(y=0;y<z;++y){if(b.$1(a[y])===!0)return!0
 if(a.length!==z)throw H.b(P.a4(a))}return!1},
+XU:function(a,b,c){var z
+if(c>=a.length)return-1
+for(z=c;z<a.length;++z)if(J.mG(a[z],b))return z
+return-1},
+OY:function(a,b){return this.XU(a,b,0)},
+Pk:function(a,b,c){var z,y
+if(c<0)return-1
+z=a.length
+if(c>=z)c=z-1
+for(y=c;y>=0;--y){if(y>=a.length)return H.e(a,y)
+if(J.mG(a[y],b))return y}return-1},
 tg:function(a,b){var z
 for(z=0;z<a.length;++z)if(J.mG(a[z],b))return!0
 return!1},
@@ -363,7 +374,7 @@ else{z=H.J(a.slice(),[H.Kp(a,0)])
 z.fixed$length=Array
 return z}},
 br:function(a){return this.tt(a,!0)},
-gu:function(a){return H.J(new H.a7(a,a.length,0,null),[H.Kp(a,0)])},
+gu:function(a){return H.J(new J.m1(a,a.length,0,null),[H.Kp(a,0)])},
 giO:function(a){return H.eQ(a)},
 gv:function(a){return a.length},
 sv:function(a,b){if(b<0)throw H.b(P.D(b,null,null))
@@ -384,8 +395,22 @@ if(typeof a!=="number"||Math.floor(a)!==a||a<0)throw H.b(P.p("Length must be a n
 z=H.J(new Array(a),[b])
 z.fixed$length=Array
 return z}}},
+m1:{
+"^":"a;Q,a,b,c",
+gk:function(){return this.c},
+D:function(){var z,y,x
+z=this.Q
+y=z.length
+if(this.a!==y)throw H.b(P.a4(z))
+x=this.b
+if(x>=y){this.c=null
+return!1}this.c=z[x]
+this.b=x+1
+return!0}},
 F:{
 "^":"Gv;",
+gzP:function(a){return a===0?1/a<0:a<0},
+gG0:function(a){return isNaN(a)},
 JV:function(a,b){return a%b},
 Vy:function(a){return Math.abs(a)},
 yu:function(a){var z
@@ -429,10 +454,12 @@ return a>b},
 $islf:1},
 im:{
 "^":"F;",
+$isCP:1,
 $islf:1,
 $isKN:1},
 VA:{
 "^":"F;",
+$isCP:1,
 $islf:1},
 E:{
 "^":"Gv;",
@@ -445,6 +472,12 @@ H.fI(c)
 if(c>b.length)throw H.b(P.TE(c,0,b.length,null,null))
 return H.ZT(a,b,c)},
 dd:function(a,b){return this.ww(a,b,0)},
+wL:function(a,b,c){var z,y
+if(c<0||c>b.length)throw H.b(P.TE(c,0,b.length,null,null))
+z=a.length
+if(c+z>b.length)return
+for(y=0;y<z;++y)if(this.O2(b,c+y)!==this.O2(a,y))return
+return new H.tQ(c,b,a)},
 g:function(a,b){if(typeof b!=="string")throw H.b(P.p(b))
 return a+b},
 Tc:function(a,b){var z,y
@@ -486,7 +519,6 @@ v=this.O2(z,w)===133?J.r9(z,w):y
 if(x===0&&v===y)return z
 return z.substring(x,v)},
 R:function(a,b){var z,y
-if(typeof b!=="number")return H.o(b)
 if(0>=b)return""
 if(b===1||a.length===0)return a
 if(b!==b>>>0)throw H.b(C.Eq)
@@ -495,8 +527,14 @@ b=b>>>1
 if(b===0)break
 z+=z}return y},
 gNq:function(a){return new H.od(a)},
-XU:function(a,b,c){if(c<0||c>a.length)throw H.b(P.TE(c,0,a.length,null,null))
-return a.indexOf(b,c)},
+XU:function(a,b,c){var z,y,x,w
+if(b==null)H.vh(P.p(null))
+if(c<0||c>a.length)throw H.b(P.TE(c,0,a.length,null,null))
+if(typeof b==="string")return a.indexOf(b,c)
+z=J.t(b)
+if(!!z.$isVR){y=b.UZ(a,c)
+return y==null?-1:y.a.index}for(x=a.length,w=c;w<=x;++w)if(z.wL(b,a,w)!=null)return w
+return-1},
 OY:function(a,b){return this.XU(a,b,0)},
 Pk:function(a,b,c){var z,y
 if(c==null)c=a.length
@@ -688,7 +726,7 @@ w=(w-1&u-1)>>>0
 y.a=w
 if(w<0||w>=u)return H.e(v,w)
 v[w]=x
-if(w===y.b)y.wL();++y.c}this.x=!1}this.Wp()},
+if(w===y.b)y.OO();++y.c}this.x=!1}this.Wp()},
 Ma:function(a){var z=this.ch
 if(z==null){z=[]
 this.ch=z}if(J.kE(z,a))return
@@ -761,7 +799,7 @@ this.b.V1(0)
 init.globalState.y.Rz(0,this.Q)
 this.dx.V1(0)
 z=this.ch
-if(z!=null){for(z=H.J(new H.a7(z,z.length,0,null),[H.Kp(z,0)]);z.D();)J.jV(z.c,null)
+if(z!=null){for(z=H.J(new J.m1(z,z.length,0,null),[H.Kp(z,0)]);z.D();)J.jV(z.c,null)
 this.ch=null}},"$0","gIm",0,0,1]},
 NY:{
 "^":"r:1;Q",
@@ -1145,7 +1183,7 @@ y+=String.fromCharCode.apply(null,a.slice(x,v))}return y},
 Cq:function(a){var z,y,x
 z=[]
 z.$builtinTypeInfo=[P.KN]
-y=new H.a7(a,a.length,0,null)
+y=new J.m1(a,a.length,0,null)
 y.$builtinTypeInfo=[H.Kp(a,0)]
 for(;y.D();){x=y.c
 if(typeof x!=="number"||Math.floor(x)!==x)throw H.b(P.p(x))
@@ -1153,7 +1191,7 @@ if(x<=65535)z.push(x)
 else if(x<=1114111){z.push(55296+(C.jn.wG(x-65536,10)&1023))
 z.push(56320+(x&1023))}else throw H.b(P.p(x))}return H.VK(z)},
 eT:function(a){var z,y
-for(z=H.J(new H.a7(a,a.length,0,null),[H.Kp(a,0)]);z.D();){y=z.c
+for(z=H.J(new J.m1(a,a.length,0,null),[H.Kp(a,0)]);z.D();){y=z.c
 if(typeof y!=="number"||Math.floor(y)!==y)throw H.b(P.p(y))
 if(y<0)throw H.b(P.p(y))
 if(y>65535)return H.Cq(a)}return H.VK(a)},
@@ -1687,7 +1725,7 @@ for(y=x.length,w=0;w<y;++w){v=x[w]
 if(z[v]===a)return v}}}},
 mh:{
 "^":"Ge;G1:Q>",
-X:function(a){return"RuntimeError: "+this.Q},
+X:function(a){return"RuntimeError: "+H.d(this.Q)},
 static:{Pa:function(a){return new H.mh(a)}}},
 lb:{
 "^":"a;"},
@@ -1922,6 +1960,12 @@ z=this.a
 z=H.v4(this.Q,z.multiline,!z.ignoreCase,!0)
 this.b=z
 return z},
+gIa:function(){var z=this.c
+if(z!=null)return z
+z=this.a
+z=H.v4(this.Q+"|()",z.multiline,!z.ignoreCase,!0)
+this.c=z
+return z},
 ww:function(a,b,c){H.Yx(b)
 H.fI(c)
 if(c>b.length)throw H.b(P.TE(c,0,b.length,null,null))
@@ -1933,6 +1977,19 @@ z.lastIndex=b
 y=z.exec(a)
 if(y==null)return
 return H.yx(this,y)},
+Oj:function(a,b){var z,y,x,w
+z=this.gIa()
+z.lastIndex=b
+y=z.exec(a)
+if(y==null)return
+x=y.length
+w=x-1
+if(w<0)return H.e(y,w)
+if(y[w]!=null)return
+C.Nm.sv(y,w)
+return H.yx(this,y)},
+wL:function(a,b,c){if(c<0||c>b.length)throw H.b(P.TE(c,0,b.length,null,null))
+return this.Oj(b,c)},
 $isvX:1,
 static:{v4:function(a,b,c,d){var z,y,x,w,v
 H.Yx(a)
@@ -3017,7 +3074,7 @@ Q9:function(a,b){return H.J(new P.ey(0,null,null,null,null,null,0),[a,b])},
 Ls:function(a,b,c,d){return H.J(new P.b6(0,null,null,null,null,null,0),[d])},
 tM:function(a,b){var z,y
 z=P.Ls(null,null,null,b)
-for(y=J.Nx(a);y.D();)z.h(0,y.c)
+for(y=J.Nx(a);y.D();)z.h(0,y.gk())
 return z},
 vW:function(a){var z,y,x
 z={}
@@ -3236,6 +3293,16 @@ ez:function(a,b){return H.J(new H.A8(a,b),[null,null])},
 h:function(a,b){var z=this.gv(a)
 this.sv(a,z+1)
 this.q(a,z,b)},
+XU:function(a,b,c){var z
+if(c>=this.gv(a))return-1
+for(z=c;z<this.gv(a);++z)if(J.mG(this.p(a,z),b))return z
+return-1},
+OY:function(a,b){return this.XU(a,b,0)},
+Pk:function(a,b,c){var z
+if(c<0)return-1
+if(c>=this.gv(a))c=this.gv(a)-1
+for(z=c;z>=0;--z)if(J.mG(this.p(a,z),b))return z
+return-1},
 X:function(a){return P.WE(a,"[","]")},
 $iszM:1,
 $aszM:null,
@@ -3298,8 +3365,8 @@ if(y<0||y>=x)return H.e(z,y)
 z[y]=a
 x=(y+1&x-1)>>>0
 this.b=x
-if(this.a===x)this.wL();++this.c},
-wL:function(){var z,y,x,w
+if(this.a===x)this.OO();++this.c},
+OO:function(){var z,y,x,w
 z=Array(this.Q.length*2)
 z.fixed$length=Array
 y=H.J(z,[H.Kp(this,0)])
@@ -3644,9 +3711,9 @@ if(!z&&c<b)throw H.b(P.TE(c,b,J.wS(a),null,null))
 y=J.Nx(a)
 for(x=0;x<b;++x)if(!y.D())throw H.b(P.TE(b,0,x,null,null))
 w=[]
-if(z)for(;y.D();)w.push(y.c)
+if(z)for(;y.D();)w.push(y.gk())
 else for(x=b;x<c;++x){if(!y.D())throw H.b(P.TE(c,b,x,null,null))
-w.push(y.c)}return H.eT(w)},
+w.push(y.gk())}return H.eT(w)},
 hl:function(a){if(typeof a==="number"||typeof a==="boolean"||null==a)return J.Lz(a)
 if(typeof a==="string")return JSON.stringify(a)
 return"Instance of '"+H.lh(a)+"'"},
@@ -3939,7 +4006,7 @@ return C.xB.OY(a,"/.")!==-1},
 mE:function(a){var z,y,x,w,v
 if(!this.jI(a))return a
 z=[]
-for(y=a.split("/"),y=H.J(new H.a7(y,y.length,0,null),[H.Kp(y,0)]),x=!1;y.D();){w=y.c
+for(y=a.split("/"),y=H.J(new J.m1(y,y.length,0,null),[H.Kp(y,0)]),x=!1;y.D();){w=y.c
 if(J.mG(w,"..")){v=z.length
 if(v!==0)if(v===1){if(0>=v)return H.e(z,0)
 v=!J.mG(z[0],"")}else v=!0
@@ -4837,7 +4904,7 @@ $isqC:1},
 D9:{
 "^":"a;",
 aN:function(a,b){var z,y
-for(z=this.gvc(),z=H.J(new H.a7(z,z.length,0,null),[H.Kp(z,0)]);z.D();){y=z.c
+for(z=this.gvc(),z=H.J(new J.m1(z,z.length,0,null),[H.Kp(z,0)]);z.D();){y=z.c
 b.$2(y,this.p(0,y))}},
 gvc:function(){var z,y,x,w
 z=this.Q.attributes
@@ -4857,7 +4924,7 @@ I4:{
 "^":"As;Q",
 DG:function(){var z,y,x
 z=P.Ls(null,null,null,P.I)
-for(y=this.Q.className.split(" "),y=H.J(new H.a7(y,y.length,0,null),[H.Kp(y,0)]);y.D();){x=J.rr(y.c)
+for(y=this.Q.className.split(" "),y=H.J(new J.m1(y,y.length,0,null),[H.Kp(y,0)]);y.D();){x=J.rr(y.c)
 if(x.length!==0)z.h(0,x)}return z},
 p5:function(a){this.Q.className=a.zV(0," ")}},
 RO:{
@@ -4905,8 +4972,8 @@ if(x==null)return!1
 return x.$4(a,b,c,this)},
 qR:function(a){var z,y
 z=$.NJ()
-if(z.gl0(z)){for(y=H.J(new H.a7(C.zm,261,0,null),[H.Kp(C.zm,0)]);y.D();)z.q(0,y.c,W.y3())
-for(y=H.J(new H.a7(C.BI,12,0,null),[H.Kp(C.BI,0)]);y.D();)z.q(0,y.c,W.WR())}},
+if(z.gl0(z)){for(y=H.J(new J.m1(C.zm,261,0,null),[H.Kp(C.zm,0)]);y.D();)z.q(0,y.c,W.y3())
+for(y=H.J(new J.m1(C.BI,12,0,null),[H.Kp(C.BI,0)]);y.D();)z.q(0,y.c,W.WR())}},
 $iskF:1,
 static:{Tw:function(a){var z=new W.mk(W.J6(null),window.location)
 z=new W.JQ(z)
@@ -5146,7 +5213,7 @@ DG:function(){var z,y,x,w
 z=this.Q.getAttribute("class")
 y=P.Ls(null,null,null,P.I)
 if(z==null)return y
-for(x=z.split(" "),x=H.J(new H.a7(x,x.length,0,null),[H.Kp(x,0)]);x.D();){w=J.rr(x.c)
+for(x=z.split(" "),x=H.J(new J.m1(x,x.length,0,null),[H.Kp(x,0)]);x.D();){w=J.rr(x.c)
 if(w.length!==0)y.h(0,w)}return y},
 p5:function(a){this.Q.setAttribute("class",a.zV(0," "))}},
 d5:{
@@ -5218,7 +5285,20 @@ a=536870911&a+((524287&a)<<10>>>0)
 return a^a>>>6},
 xk:function(a){a=536870911&a+((67108863&a)<<3>>>0)
 a^=a>>>11
-return 536870911&a+((16383&a)<<15>>>0)}}],["","",,H,{
+return 536870911&a+((16383&a)<<15>>>0)},
+C:function(a,b){if(typeof a!=="number")throw H.b(P.p(a))
+if(typeof b!=="number")throw H.b(P.p(b))
+if(a>b)return b
+if(a<b)return a
+if(typeof b==="number"){if(typeof a==="number")if(a===0)return(a+b)*a*b
+if(a===0&&C.ON.gzP(b)||C.ON.gG0(b))return b
+return a}return a},
+u:function(a,b){if(a>b)return a
+if(a<b)return b
+if(typeof b==="number"){if(typeof a==="number")if(a===0)return a+b
+if(isNaN(b))return b
+return a}if(b===0&&C.CD.gzP(a))return b
+return a}}],["","",,H,{
 "^":"",
 WZ:{
 "^":"Gv;",
@@ -5412,14 +5492,22 @@ RR:function(a,b){return b.tS(this)}},
 bO:{
 "^":"a;Q,a,mO:b>,G1:c>",
 RR:function(a,b){return b.IR(this)},
-static:{Vd:[function(a){var z,y,x,w,v
+static:{Vd:[function(a){var z,y,x,w,v,u,t,s
 z=J.U6(a)
-y=O.XR(z.p(a,"start"),null,null,z.p(a,"url"))
-x=O.XR(z.p(a,"end"),null,null,z.p(a,"url"))
-w=z.p(a,"text")
-v=new T.Y5(y,x,w)
-v.Y9(y,x,w)
-return new X.bO(z.p(a,"kind"),z.p(a,"level"),v,z.p(a,"message"))},"$1","e2",2,0,37]}},
+y=J.Tf(z.p(a,"start"),0)
+x=z.p(a,"url")
+w=J.Tf(z.p(a,"start"),1)
+v=O.XR(y,J.Tf(z.p(a,"start"),2),w,x)
+x=J.Tf(z.p(a,"end"),0)
+w=z.p(a,"url")
+y=J.Tf(z.p(a,"end"),1)
+u=O.XR(x,J.Tf(z.p(a,"end"),2),y,w)
+t=z.p(a,"context")
+if(t!=null){y=z.p(a,"text")
+s=new E.hF(t,v,u,y)
+s.Y9(v,u,y)
+s.kd(v,u,y,t)}else s=T.HW(v,u,z.p(a,"text"))
+return new X.bO(z.p(a,"kind"),z.p(a,"level"),s,z.p(a,"message"))},"$1","e2",2,0,37]}},
 zv:{
 "^":"a;",
 ai:function(a){var z
@@ -5562,52 +5650,53 @@ o5:function(a){var z=Q.lo(a,this.Q)
 z.p3()
 return z.X(0)},
 j2:function(a,b){var z,y,x,w,v
-b=B.RX()
+b=this.a
+b=b!=null?b:B.RX()
 z=this.Q
 if(z.Yr(b)<=0&&z.Yr(a)>0)return this.o5(a)
-if(z.Yr(a)<=0||z.hK(a))a=this.q7(0,B.RX(),a,null,null,null,null,null,null)
-if(z.Yr(a)<=0&&z.Yr(b)>0)throw H.b(E.I7("Unable to find a path to \""+a+"\" from \""+b+"\"."))
-y=Q.lo(b,z)
-y.p3()
-x=Q.lo(a,z)
+if(z.Yr(a)<=0||z.hK(a)){y=this.a
+a=this.q7(0,y!=null?y:B.RX(),a,null,null,null,null,null,null)}if(z.Yr(a)<=0&&z.Yr(b)>0)throw H.b(E.I7("Unable to find a path to \""+a+"\" from \""+H.d(b)+"\"."))
+x=Q.lo(b,z)
 x.p3()
-w=y.c
-if(w.length>0&&J.mG(w[0],"."))return x.X(0)
-if(!J.mG(y.a,x.a)){w=y.a
-if(!(w==null||x.a==null)){w=J.Mz(w)
+w=Q.lo(a,z)
+w.p3()
+y=x.c
+if(y.length>0&&J.mG(y[0],"."))return w.X(0)
+if(!J.mG(x.a,w.a)){y=x.a
+if(!(y==null||w.a==null)){y=J.Mz(y)
 H.Yx("\\")
-w=H.ys(w,"/","\\")
-v=J.Mz(x.a)
+y=H.ys(y,"/","\\")
+v=J.Mz(w.a)
 H.Yx("\\")
-v=w!==H.ys(v,"/","\\")
-w=v}else w=!0}else w=!1
-if(w)return x.X(0)
-while(!0){w=y.c
-if(w.length>0){v=x.c
-w=v.length>0&&J.mG(w[0],v[0])}else w=!1
-if(!w)break
-C.Nm.W4(y.c,0)
-C.Nm.W4(y.d,1)
+v=y!==H.ys(v,"/","\\")
+y=v}else y=!0}else y=!1
+if(y)return w.X(0)
+while(!0){y=x.c
+if(y.length>0){v=w.c
+y=v.length>0&&J.mG(y[0],v[0])}else y=!1
+if(!y)break
 C.Nm.W4(x.c,0)
-C.Nm.W4(x.d,1)}w=y.c
-if(w.length>0&&J.mG(w[0],".."))throw H.b(E.I7("Unable to find a path to \""+a+"\" from \""+b+"\"."))
-C.Nm.UG(x.c,0,P.O8(y.c.length,"..",null))
-w=x.d
-if(0>=w.length)return H.e(w,0)
-w[0]=""
-C.Nm.UG(w,1,P.O8(y.c.length,z.gmI(),null))
-z=x.c
-w=z.length
-if(w===0)return"."
-if(w>1&&J.mG(C.Nm.grZ(z),".")){z=x.c
+C.Nm.W4(x.d,1)
+C.Nm.W4(w.c,0)
+C.Nm.W4(w.d,1)}y=x.c
+if(y.length>0&&J.mG(y[0],".."))throw H.b(E.I7("Unable to find a path to \""+a+"\" from \""+H.d(b)+"\"."))
+C.Nm.UG(w.c,0,P.O8(x.c.length,"..",null))
+y=w.d
+if(0>=y.length)return H.e(y,0)
+y[0]=""
+C.Nm.UG(y,1,P.O8(x.c.length,z.gmI(),null))
+z=w.c
+y=z.length
+if(y===0)return"."
+if(y>1&&J.mG(C.Nm.grZ(z),".")){z=w.c
 if(0>=z.length)return H.e(z,0)
 z.pop()
-z=x.d
+z=w.d
 C.Nm.mv(z)
 C.Nm.mv(z)
-C.Nm.h(z,"")}x.a=""
-x.Ix()
-return x.X(0)},
+C.Nm.h(z,"")}w.a=""
+w.Ix()
+return w.X(0)},
 by:function(a){return this.j2(a,null)},
 D8:function(a){var z,y,x,w
 if(typeof a==="string")a=P.hK(a)
@@ -5658,7 +5747,7 @@ y=z.length
 if(y>0)z[y-1]=""},
 p3:function(){var z,y,x,w,v,u
 z=[]
-for(y=this.c,y=H.J(new H.a7(y,y.length,0,null),[H.Kp(y,0)]),x=0;y.D();){w=y.c
+for(y=this.c,y=H.J(new J.m1(y,y.length,0,null),[H.Kp(y,0)]),x=0;y.D();){w=y.c
 v=J.t(w)
 if(v.m(w,".")||v.m(w,""));else if(v.m(w,".."))if(z.length>0)z.pop()
 else ++x
@@ -5804,10 +5893,10 @@ return P.pE(H.ys(y,"/","\\"),C.dy,!1)}}}],["","",,F,{
 "^":"",
 Iq:[function(){var z=0,y=new P.Z(),x,w=2,v,u
 function body(a,b){if(a===1){v=b
-z=w}while(true)switch(z){case 0:u=F.S
+z=w}while(true)switch(z){case 0:u=F
 z=3
 return H.U(W.X("messages.json",null,null),body,y)
-case 3:x=u(b)
+case 3:x=u.S(b)
 z=1
 break
 case 1:return H.U(x,0,y,null)
@@ -5829,7 +5918,7 @@ document.body.appendChild(w)},
 m7:function(a){return J.Yr(a,$.KO(),new F.Rb())},
 vQ:{
 "^":"r:13;Q,a,b,c",
-$2:function(a,b){var z,y,x,w,v,u,t,s,r,q,p,o,n,m,l
+$2:function(a,b){var z,y,x,w,v,u,t,s,r,q,p,o,n,m,l,k
 z=document.createElement("div",null)
 J.pP(z).h(0,a)
 y=J.U6(b)
@@ -5847,31 +5936,41 @@ s=t.b5(u,0,J.wS(u))
 r=F.m7(s==null?u:s)
 q=w.gmO(v)
 w="<div class=\"message\"><div class=\"text "+H.d(a)+"\">"+r+"</div>"
-if(q!=null){u=J.cW(q)
-p=u.Q
-u="<div class=\"location\">  <span class=\"location\">"+(H.d(p==null?"unknown source":p)+":"+(u.b+1)+":"+H.d(J.WB(u.c,1)))+"</span></div>  <span class=\"text\">"
-o=q.b
-s=t.b5(o,0,J.wS(o))
-w+=u+H.d(s==null?o:s)+"</span></div></div>"}w+="</div>"
+if(q!=null){u=J.R(q)
+p=u.gJ(q)
+o=p.Q
+w+="<div class=\"location\">  <span class=\"location\">"+(H.d(o==null?"unknown source":o)+":"+H.d(J.WB(p.b,1))+":"+H.d(J.WB(p.c,1)))+"</span></div>  <span class=\"text\">"
+if(!!u.$ishF){n=q.c
+u=J.rY(n).Nj(n,0,q.Q.c)
+s=t.b5(u,0,u.length)
+w=w+H.d(s==null?u:s)+("<span class=\""+H.d(a)+"\">")
+u=q.b
+s=t.b5(u,0,J.wS(u))
+w=w+H.d(s==null?u:s)+"</span>"
+u=C.xB.yn(n,q.a.c)
+s=t.b5(u,0,u.length)
+w+=H.d(s==null?u:s)}else{u=q.b
+s=t.b5(u,0,J.wS(u))
+w+=H.d(s==null?u:s)}w+="</span></div></div>"}w+="</div>"
 w=w.charCodeAt(0)==0?w:w
 u=[]
 u.$builtinTypeInfo=[W.kF]
 u.push(W.Tw(null))
 u.push(W.Bl())
 u.push(W.GA(new F.qv(),["A::accesskey","A::coords","A::hreflang","A::name","A::shape","A::tabindex","A::target","A::type","FORM::accept","FORM::autocomplete","FORM::enctype","FORM::method","FORM::name","FORM::novalidate","FORM::target"],["A","FORM"],["A::href","FORM::action"]))
-n=W.U9(w,null,new W.vD(u))
-z.appendChild(n)
-m=J.c1(n,"div.text")
-w=J.Vg(m)
+m=W.U9(w,null,new W.vD(u))
+z.appendChild(m)
+l=J.c1(m,"div.text")
+w=J.Vg(l)
 u=w.a
 t=w.b
-o=new W.xC(0,w.Q,u,W.aF(new F.IX(m)),t)
-o.$builtinTypeInfo=[H.Kp(w,0)]
-w=o.c
-l=w!=null
-if(l&&o.Q<=0){o=o.a
-o.toString
-if(l)J.F8(o,u,w,t)}}}},
+p=new W.xC(0,w.Q,u,W.aF(new F.IX(l)),t)
+p.$builtinTypeInfo=[H.Kp(w,0)]
+w=p.c
+k=w!=null
+if(k&&p.Q<=0){p=p.a
+p.toString
+if(k)J.F8(p,u,w,t)}}}},
 IL:{
 "^":"r:2;Q,a,b,c",
 $1:function(a){this.Q.Nm(0,this.c)
@@ -5906,7 +6005,7 @@ $0:function(){return[]}}},1],["","",,O,{
 SL:{
 "^":"a;Q,a,b,c",
 gRo:function(){var z=this.Q
-return H.d(z==null?"unknown source":z)+":"+(this.b+1)+":"+H.d(J.WB(this.c,1))},
+return H.d(z==null?"unknown source":z)+":"+H.d(J.WB(this.b,1))+":"+H.d(J.WB(this.c,1))},
 fH:function(a){var z,y
 z=this.Q
 y=a.Q
@@ -5921,11 +6020,15 @@ if(typeof y!=="number")return H.o(y)
 return z+y},
 X:function(a){return"<"+H.d(new H.cu(H.dJ(this),null))+": "+H.d(this.a)+" "+this.gRo()+">"},
 dl:function(a,b,c,d){if(J.UN(this.a,0))throw H.b(P.C3("Offset may not be negative, was "+H.d(a)+"."))
+else if(J.UN(this.b,0))throw H.b(P.C3("Line may not be negative, was "+H.d(c)+"."))
 else if(J.UN(this.c,0))throw H.b(P.C3("Column may not be negative, was "+H.d(b)+"."))},
-static:{XR:function(a,b,c,d){var z=typeof d==="string"?P.hK(d):d
-z=new O.SL(z,a,0,a)
-z.dl(a,b,c,d)
-return z}}}}],["","",,T,{
+static:{XR:function(a,b,c,d){var z,y,x
+z=typeof d==="string"?P.hK(d):d
+y=c==null?0:c
+x=b==null?a:b
+x=new O.SL(z,a,y,x)
+x.dl(a,b,c,d)
+return x}}}}],["","",,T,{
 "^":"",
 m5:{
 "^":"a;"},
@@ -5939,21 +6042,43 @@ w=x.Q
 if(!J.mG(y,w))throw H.b(P.p("Source URLs \""+H.d(w)+"\" and  \""+H.d(y)+"\" don't match."))
 else if(J.UN(z.a,x.a))throw H.b(P.p("End "+z.X(0)+" must come after start "+x.X(0)+"."))
 else{y=this.b
-if(!J.mG(J.wS(y),x.fH(z)))throw H.b(P.p("Text \""+H.d(y)+"\" must be "+H.d(x.fH(z))+" characters long."))}}}}],["","",,Y,{
+if(!J.mG(J.wS(y),x.fH(z)))throw H.b(P.p("Text \""+H.d(y)+"\" must be "+H.d(x.fH(z))+" characters long."))}},
+static:{HW:function(a,b,c){var z=new T.Y5(a,b,c)
+z.Y9(a,b,c)
+return z}}}}],["","",,Y,{
 "^":"",
 Jo:{
 "^":"a;",
 gv:function(a){return J.D5(this.geX().a,this.Q.a)},
-XA:[function(a,b,c){var z,y,x,w
+XA:[function(a,b,c){var z,y,x,w,v,u,t,s,r,q,p
 z=this.Q
-y="line "+(this.gJ(this).b+1)+", column "+H.d(J.WB(z.c,1))
-x=z.Q
-if(x!=null)y+=" of "+$.LX().D8(x)
-y+=": "+H.d(b)
-if(J.mG(J.D5(this.a.a,z.a),0))return y.charCodeAt(0)==0?y:y
-z=y+"\n"
-w=C.Nm.gFV(J.Gn(this.b,"\n"))
-z=z+H.d(w)+"\n"+C.xB.R("^",J.wS(w))
+y=z.c
+x="line "+H.d(J.WB(this.gJ(this).b,1))+", column "+H.d(J.WB(y,1))
+w=z.Q
+if(w!=null)x+=" of "+$.LX().D8(w)
+x+=": "+H.d(b)
+w=this.a.a
+z=z.a
+if(J.mG(J.D5(w,z),0)&&!this.$ishF)return x.charCodeAt(0)==0?x:x
+x+="\n"
+if(!!this.$ishF){v=this.c
+u=J.U6(v)
+t=u.Pk(v,"\n",u.OY(v,C.Nm.gFV(J.Gn(this.b,"\n"))))
+if(t!==-1){s=t+1
+u=x+u.Nj(v,0,s)
+v=C.xB.yn(v,s)
+x=u}u=J.U6(v)
+r=u.OY(v,"\n")
+q=r===-1?v:u.Nj(v,0,r+1)
+y=P.C(y,J.wS(q)-1)}else{q=C.Nm.gFV(J.Gn(this.b,"\n"))
+y=0}if(typeof w!=="number")return H.o(w)
+if(typeof z!=="number")return H.o(z)
+u=J.U6(q)
+p=P.C(y+w-z,u.gv(q))
+z=x+H.d(q)
+if(!u.Tc(q,"\n"))z+="\n"
+z+=C.xB.R(" ",y)
+z+=C.xB.R("^",P.u(p-y,1))
 return z.charCodeAt(0)==0?z:z},function(a,b){return this.XA(a,b,null)},"Xj","$2$color","$1","gG1",2,3,25,38],
 m:function(a,b){var z
 if(b==null)return!1
@@ -5974,7 +6099,18 @@ z="<"+H.d(new H.cu(H.dJ(this),null))+": from "
 y=this.gJ(this)
 x=this.a
 return z+("<"+H.d(new H.cu(H.dJ(y),null))+": "+H.d(y.a)+" "+y.gRo()+">")+" to "+("<"+H.d(new H.cu(H.dJ(x),null))+": "+H.d(x.a)+" "+x.gRo()+">")+" \""+H.d(this.b)+"\">"},
-$ism5:1}}],]
+$ism5:1}}],["","",,E,{
+"^":"",
+hF:{
+"^":"Y5;c,Q,a,b",
+kd:function(a,b,c,d){var z,y,x,w,v
+z=this.c
+y=J.U6(z)
+x=y.OY(z,c)
+if(x===-1)throw H.b(P.p("The context line \""+H.d(z)+"\" must contain \""+H.d(c)+"\"."))
+w=a.c
+v=J.t(w)
+if(!v.m(w,x-(y.Pk(z,"\n",x)+1)))throw H.b(P.p("The span text \""+H.d(c)+"\" must start at column "+H.d(v.g(w,1))+" in a line within \""+H.d(z)+"\"."))}}}],]
 parseReflectionData(dart)
 J.Qc=function(a){if(typeof a=="number")return J.F.prototype
 if(typeof a=="string")return J.E.prototype
@@ -6042,7 +6178,6 @@ J.WB=function(a,b){if(typeof a=="number"&&typeof b=="number")return a+b
 return J.Qc(a).g(a,b)}
 J.Yr=function(a,b,c){return J.rY(a).nx(a,b,c)}
 J.c1=function(a,b){return J.R(a).Wk(a,b)}
-J.cW=function(a){return J.R(a).gJ(a)}
 J.dX=function(a){return J.Wx(a).Vy(a)}
 J.i4=function(a,b){return J.w1(a).h(a,b)}
 J.i9=function(a,b){return J.w1(a).Zv(a,b)}
@@ -6070,6 +6205,7 @@ a.fixed$length=Array
 return a}
 C.Dt=W.zU.prototype
 C.Nm=J.G.prototype
+C.ON=J.VA.prototype
 C.jn=J.im.prototype
 C.jN=J.PE.prototype
 C.CD=J.F.prototype