Properly parse jsshell and d8 stack frames.

pkg/stack_trace/lib/src/frame.dart

Index: pkg/stack_trace/lib/src/frame.dart
diff --git a/pkg/stack_trace/lib/src/frame.dart b/pkg/stack_trace/lib/src/frame.dart
index b15f65140cbf90035fbdfd137c345b3248733562..d981f0746b529d22366c20e957b005ce57df2a63 100644
--- a/pkg/stack_trace/lib/src/frame.dart
+++ b/pkg/stack_trace/lib/src/frame.dart
@@ -136,14 +136,17 @@ class Frame {
 
     // V8 stack frames can be in two forms.
     if (match[2] != null) {
-      // The first form looks like "  at FUNCTION (URI:LINE:COL)"
-      var uri = Uri.parse(match[2]);
+      // The first form looks like " at FUNCTION (PATH:LINE:COL)". PATH is
+      // usually an absolute URL, but it can be a path if the stack frame came
+      // from d8.
+      var uri = _uriOrPathToUri(match[2]);
       var member = match[1].replaceAll("<anonymous>", "<fn>");
       return new Frame(uri, int.parse(match[3]), int.parse(match[4]), member);
     } else {
-      // The second form looks like " at URI:LINE:COL", and is used for
-      // anonymous functions.
-      var uri = Uri.parse(match[5]);
+      // The second form looks like " at PATH:LINE:COL", and is used for
+      // anonymous functions. PATH is usually an absolute URL, but it can be a
+      // path if the stack frame came from d8.
+      var uri = _uriOrPathToUri(match[5]);
       return new Frame(uri, int.parse(match[6]), int.parse(match[7]), "<fn>");
     }
   }
@@ -162,7 +165,8 @@ class Frame {
           "Couldn't parse Firefox stack trace line '$frame'.");
     }
 
-    var uri = Uri.parse(match[3]);
+    // Normally this is a URI, but in a jsshell trace it can be a path.
+    var uri = _uriOrPathToUri(match[3]);
     var member = match[1];
     member += new List.filled('/'.allMatches(match[2]).length, ".<fn>").join();
     if (member == '') member = '<fn>';
@@ -215,6 +219,30 @@ class Frame {
     return new Frame(uri, line, column, match[4]);
   }
 
+  /// A regular expression matching an absolute URI.
+  static final _uriRegExp = new RegExp(r'^[a-zA-Z][-+.a-zA-Z\d]*://');
+
+  /// A regular expression matching a Windows path.
+  static final _windowsRegExp = new RegExp(r'^[a-zA-Z]:[\/]');

[Bob Nystrom, 2013/11/07 22:25:10]

What about UNC paths?

[nweiz, 2013/11/07 22:40:12]

They were implicitly supported by the uriOrPath.contains('\') case, but I've
added more explicit support.

+
+  /// Converts [uriOrPath], which can be a URI, a Windows path, or a Posix path,
+  /// to a URI (absolute if possible).
+  static Uri _uriOrPathToUri(String uriOrPath) {
+    if (uriOrPath.contains(_uriRegExp)) {
+      return Uri.parse(uriOrPath);
+    } else if (uriOrPath.contains(_windowsRegExp)) {
+      return new Uri.file(uriOrPath, windows: true);
+    } else if (uriOrPath.startsWith('/')) {
+      return new Uri.file(uriOrPath, windows: false);
+    }
+
+    // As far as I've seen, Firefox and V8 both always report absolute paths in
+    // their stack frames. However, if we do get a relative path, we should
+    // handle it gracefully.
+    if (uriOrPath.contains('\\')) return path.windows.toUri(uriOrPath);
+    return Uri.parse(uriOrPath);
+  }
+
   Frame(this.uri, this.line, this.column, this.member);
 
   String toString() => '$location in $member';