From 1dd52424c8c41f5258a3b846602da4e62949b1eb Mon Sep 17 00:00:00 2001
From: "nweiz@google.com" <nweiz@google.com>
Date: Fri, 20 Jun 2014 00:54:44 +0000
Subject: [PATCH] Properly return Windows-formatted paths from
package.listFiles.
In r37514 I incorrectly assumed that the problem was Directory.list
when in fact it's git.
R=rnystrom@google.com
Review URL: https://codereview.chromium.org//349503003
git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge@37527 260f80e4-7a28-3924-810f-c04153c831b5
---
lib/src/io.dart | 5 +----
lib/src/package.dart | 10 +++++++---
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/lib/src/io.dart b/lib/src/io.dart
index 8aae3e21..4d4ddd5a 100644
--- a/lib/src/io.dart
+++ b/lib/src/io.dart
@@ -303,10 +303,7 @@ List<String> listDir(String dir, {bool recursive: false,
if (pathInDir.contains("/.")) return false;
if (Platform.operatingSystem != "windows") return true;
return !pathInDir.contains("\\.");
- }).map((entity) {
- if (Platform.operatingSystem != "windows") return entity.path;
- return entity.path.replaceAll("/", "\\");
- }).toList();
+ }).map((entity) => entity.path).toList();
}
/// Returns whether [dir] exists on the file system.
diff --git a/lib/src/package.dart b/lib/src/package.dart
index d899a3e6..fc2c2b52 100644
--- a/lib/src/package.dart
+++ b/lib/src/package.dart
@@ -146,9 +146,13 @@ class Package {
// Git always prints files relative to the repository root, but we want
// them relative to the working directory. It also prints forward slashes
// on Windows which we normalize away for easier testing.
- files = files.map((file) => "$dir${path.separator}$file")
- // Filter out broken symlinks, since git doesn't do so automatically.
- .where((file) => !linkExists(file) || fileExists(file));
+ files = files.map((file) {
+ if (Platform.operatingSystem != 'windows') return "$dir/$file";
+ return "$dir\\${file.replaceAll("/", "\\")}";
+ }).where((file) {
+ // Filter out broken symlinks, since git doesn't do so automatically.
+ return !linkExists(file) || fileExists(file);
+ });
} else {
files = listDir(beneath, recursive: true, includeDirs: false,
whitelist: _WHITELISTED_FILES);
--
GitLab