Foundation: correct directory iteration on Windows

The path that was being constructed would elide the penultimate arc in
the path as the base URL was not marked as a directory.  As such, it was
assumed to be a file URL, and making a URL relative to it would truncate
the previously last arc.  Append the path component instead and
explicitly indicate if it is a directory component when building the URL
as we already have the information on hand.

This repairs the directory traversal on Windows.  The bug was identified
by the DocC test suite on Windows.

Author: compnerd

Sources/Foundation/FileManager+Win32.swift

@@ -989,7 +989,9 @@ extension FileManager {
                        ffd.dwFileAttributes & DWORD(FILE_ATTRIBUTE_HIDDEN) == DWORD(FILE_ATTRIBUTE_HIDDEN) {
                       continue
                     }
-                    _stack.append(URL(fileURLWithPath: file, relativeTo: _lastReturned))
+
+                    let isDirectory = ffd.dwFileAttributes & DWORD(FILE_ATTRIBUTE_DIRECTORY) == DWORD(FILE_ATTRIBUTE_DIRECTORY)
+                    _stack.append(_lastReturned.appendingPathComponent(file, isDirectory: isDirectory))
                 } while FindNextFileW(handle, &ffd)
             }
             return firstValidItem()

Tests/Foundation/Tests/TestFileManager.swift

@@ -750,6 +750,21 @@ class TestFileManager : XCTestCase {
             XCTFail("Failed to clean up files")
         }
     }
+
+    func test_contentsOfDirectoryEnumeration() {
+        let fm = FileManager.default
+
+        let root = URL(fileURLWithPath: NSTemporaryDirectory()).appendingPathComponent(NSUUID().uuidString, isDirectory: true)
+        let subdirectory = root.appendingPathComponent("subdirectory", isDirectory: true)
+        let file = subdirectory.appendingPathComponent("file", isDirectory: false)
+        try? fm.removeItem(at: root)
+
+        XCTAssertNoThrow(fm.createDirectory(at: subdirectory, withIntermediateDirectories: true, attributes: nil))
+        XCTAssertNoThrow(fm.createFile(atPath: file.path, contents: Data(), attributes: nil))
+        let contents = try XCTUnwrap(fm.contentsOfDirectory(at: root, includingPropertiesForKeys: [.isDirectoryKey], options: [.skipsHiddenFiles]))
+        XCTAssertEqual(contents.count, 2)
+        XCTAssertEqual(contents, [subdirectory, file])
+    }
 
     func test_subpathsOfDirectoryAtPath() {
         let fm = FileManager.default
@@ -2028,6 +2043,7 @@ VIDEOS=StopgapVideos
             ("test_directoryEnumerator", test_directoryEnumerator),
             ("test_pathEnumerator",test_pathEnumerator),
             ("test_contentsOfDirectoryAtPath", test_contentsOfDirectoryAtPath),
+            ("test_contentsOfDirectoryEnumeration", test_contentsOfDirectoryEnumeration),
             ("test_subpathsOfDirectoryAtPath", test_subpathsOfDirectoryAtPath),
             ("test_copyItemAtPathToPath", test_copyItemAtPathToPath),
             ("test_linkItemAtPathToPath", testExpectedToFailOnAndroid(test_linkItemAtPathToPath, "Android doesn't allow hard links")),