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

Unified Diff: sdk/lib/_internal/dartdoc/lib/src/mirrors/dart2js_mirror.dart

Issue 11369074: Handle (missing) trailing slash in dartdoc (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Updated cf. comments Created 8 years, 1 month 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 | « sdk/lib/_internal/dartdoc/lib/dartdoc.dart ('k') | tools/create_sdk.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sdk/lib/_internal/dartdoc/lib/src/mirrors/dart2js_mirror.dart
diff --git a/sdk/lib/_internal/dartdoc/lib/src/mirrors/dart2js_mirror.dart b/sdk/lib/_internal/dartdoc/lib/src/mirrors/dart2js_mirror.dart
index a28bb7ff3aa628f1e8bd7147863e4c3e168f23f7..61e27b85dee175a3e12c682771e55648ae5f4997 100644
--- a/sdk/lib/_internal/dartdoc/lib/src/mirrors/dart2js_mirror.dart
+++ b/sdk/lib/_internal/dartdoc/lib/src/mirrors/dart2js_mirror.dart
@@ -339,10 +339,13 @@ class Dart2JsCompilation implements Compilation {
Dart2JsCompilation(Path script, Path libraryRoot,
[Path packageRoot, List<String> opts = const <String>[]])
: cwd = getCurrentDirectory(), sourceFiles = <String, SourceFile>{} {
- var libraryUri = cwd.resolve(libraryRoot.toString());
+ // Ensure that the URI ends with a / an thus is interpreted as a directory.
+ var libraryUri = cwd.resolve(
+ libraryRoot.hasTrailingSeparator ? '$libraryRoot' : '$libraryRoot/');
var packageUri;
if (packageRoot != null) {
- packageUri = cwd.resolve(packageRoot.toString());
+ packageUri = cwd.resolve(
+ libraryRoot.hasTrailingSeparator ? '$packageRoot' : '$packageRoot/');
} else {
packageUri = libraryUri;
}
@@ -356,10 +359,13 @@ class Dart2JsCompilation implements Compilation {
Dart2JsCompilation.library(List<Path> libraries, Path libraryRoot,
[Path packageRoot, List<String> opts = const <String>[]])
: cwd = getCurrentDirectory(), sourceFiles = <String, SourceFile>{} {
- var libraryUri = cwd.resolve(libraryRoot.toString());
+ // Ensure that the URI ends with a / an thus is interpreted as a directory.
+ var libraryUri = cwd.resolve(
+ libraryRoot.hasTrailingSeparator ? '$libraryRoot' : '$libraryRoot/');
var packageUri;
if (packageRoot != null) {
- packageUri = cwd.resolve(packageRoot.toString());
+ packageUri = cwd.resolve(
+ libraryRoot.hasTrailingSeparator ? '$packageRoot' : '$packageRoot/');
} else {
packageUri = libraryUri;
}
« no previous file with comments | « sdk/lib/_internal/dartdoc/lib/dartdoc.dart ('k') | tools/create_sdk.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698