Fix matching of paths containing ../

Author: nicklockwood

Sources/Globs.swift

@@ -106,6 +106,6 @@ func matchGlobs(_ globs: [Glob], in directory: String) -> [URL] {
             }
         }
     }
-    enumerate(URL(fileURLWithPath: directory))
+    enumerate(URL(fileURLWithPath: directory).standardized)
     return urls
 }

Sources/SwiftFormat.swift

@@ -272,7 +272,7 @@ public func enumerateFiles(withInputURL inputURL: URL,
 
 // Process configuration in all directories in specified path.
 func gatherOptions(_ options: inout Options, for inputURL: URL, with logger: Logger?) throws {
-    var directory = URL(fileURLWithPath: inputURL.pathComponents[0])
+    var directory = URL(fileURLWithPath: inputURL.pathComponents[0]).standardized
     for part in inputURL.pathComponents.dropFirst().dropLast() {
         directory.appendPathComponent(part)
         if shouldSkipFile(directory, with: options) {
@@ -606,12 +606,12 @@ public func lint(
 
 public func expandPath(_ path: String, in directory: String) -> URL {
     if path.hasPrefix("/") {
-        return URL(fileURLWithPath: path)
+        return URL(fileURLWithPath: path).standardized
     }
     if path.hasPrefix("~") {
-        return URL(fileURLWithPath: NSString(string: path).expandingTildeInPath)
+        return URL(fileURLWithPath: NSString(string: path).expandingTildeInPath).standardized
     }
-    return URL(fileURLWithPath: directory).appendingPathComponent(path)
+    return URL(fileURLWithPath: directory).appendingPathComponent(path).standardized
 }
 
 struct ResourceValues {

Tests/GlobsTests.swift

@@ -123,6 +123,13 @@ class GlobsTests: XCTestCase {
         XCTAssertEqual(matchGlobs(expandGlobs(path, in: directory.path), in: directory.path).count, 1)
     }
 
+    func testExpandPathWithDotDot() {
+        let path = "Tests/BadConfig/../SwiftFormatTests.swift"
+        let directory = URL(fileURLWithPath: #file)
+            .deletingLastPathComponent().deletingLastPathComponent()
+        XCTAssertEqual(matchGlobs(expandGlobs(path, in: directory.path), in: directory.path).count, 1)
+    }
+
     // MARK: glob regex
 
     func testWildcardRegex() {

Tests/XCTestManifests.swift

@@ -191,6 +191,7 @@ extension GlobsTests {
         ("testExpandPathsWithEitherOr", testExpandPathsWithEitherOr),
         ("testExpandPathWithCharacterClass", testExpandPathWithCharacterClass),
         ("testExpandPathWithCharacterClassRange", testExpandPathWithCharacterClassRange),
+        ("testExpandPathWithDotDot", testExpandPathWithDotDot),
         ("testExpandPathWithDoubleWildcardAtEnd", testExpandPathWithDoubleWildcardAtEnd),
         ("testExpandPathWithEitherOr", testExpandPathWithEitherOr),
         ("testExpandPathWithEitherOrContainingDot", testExpandPathWithEitherOrContainingDot),