Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(101)

Unified Diff: pkg/stack_trace/lib/src/utils.dart

Issue 14449004: Clean up various ways we find paths in pub. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Code review changes. Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | sdk/bin/pub » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/stack_trace/lib/src/utils.dart
diff --git a/pkg/stack_trace/lib/src/utils.dart b/pkg/stack_trace/lib/src/utils.dart
index 790dec88b6e93e00650d3256b056669589214deb..ec764e5980d87362cdde811326aa00028aa2a2c0 100644
--- a/pkg/stack_trace/lib/src/utils.dart
+++ b/pkg/stack_trace/lib/src/utils.dart
@@ -15,7 +15,14 @@ String fileUriToPath(Uri uri) {
throw new ArgumentError("Uri $uri must have scheme 'file:'.");
}
if (Platform.operatingSystem != 'windows') return uri.path;
- return uri.path.replaceFirst("/", "").replaceAll("/", "\\");
+ if (uri.path.startsWith("/")) {
+ // Drive-letter paths look like "file:///C:/path/to/file". The replaceFirst
+ // removes the extra initial slash.
+ return uri.path.replaceFirst("/", "").replaceAll("/", "\\");
+ } else {
+ // Network paths look like "file://hostname/path/to/file".
+ return "\\\\${uri.path.replaceAll("/", "\\")}";
+ }
}
/// Converts a local path string to a `file:` [Uri].
@@ -23,7 +30,11 @@ Uri pathToFileUri(String pathString) {
pathString = path.absolute(pathString);
if (Platform.operatingSystem != 'windows') {
return Uri.parse('file://$pathString');
+ } else if (path.rootPrefix(path).startsWith('\\\\')) {
+ // Network paths become "file://hostname/path/to/file".
+ return Uri.parse('file:${pathString.replaceAll("\\", "/")}');
} else {
+ // Drive-letter paths become "file:///C:/path/to/file".
return Uri.parse('file:///${pathString.replaceAll("\\", "/")}');
}
}
« no previous file with comments | « no previous file | sdk/bin/pub » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698