Lexically normalize glob paths. Closes #425 (#449)

peripheryapp · Dec 30, 2021 · 42500fc · 42500fc
1 parent 523518b
commit 42500fc
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@
 - Fix redundant public accessibility analysis of enum associated value types.
 - Fix redundant public accessibility analysis of aliased types.
 - Comment commands can now retain redundant protocols.
+- Fix excluding paths that contain relative components, e.g `--report-exclude "../file.swift"`.
 
 ## 2.8.3 (2021-11-29)
 

diff --git a/Sources/Shared/Extensions/FilePath+Glob.swift b/Sources/Shared/Extensions/FilePath+Glob.swift
@@ -17,7 +17,7 @@ public extension FilePath {
             pattern: absolutePattern,
             blacklistedDirectories: [".build", "node_modules"],
             logger: inject()
-        ).paths.map { FilePath($0) })
+        ).paths.map { FilePath($0).lexicallyNormalized() })
     }
 }
 

diff --git a/Tests/PeripheryTests/Extensions/FilePathGlobTest.swift b/Tests/PeripheryTests/Extensions/FilePathGlobTest.swift
@@ -101,6 +101,25 @@ class FilePathGlobTest : XCTestCase {
         }
     }
 
+    func testRelativeParent() {
+        FilePath("\(baseDir)/dir1").chdir() {
+            let pattern = "../bar"
+            let paths = FilePath.glob(pattern).sorted()
+            XCTAssertPathsEqual(paths, [
+                "\(baseDir)/bar"
+            ])
+        }
+
+        FilePath("\(baseDir)/dir1/dir2").chdir() {
+            let pattern = "../../**/*.ext"
+            let paths = FilePath.glob(pattern).sorted()
+            XCTAssertPathsEqual(paths, [
+                "\(baseDir)/dir1/dir2/dir3/file2.ext",
+                "\(baseDir)/dir1/file1.ext"
+            ])
+        }
+    }
+
     // MARK: - Private
 
     private func XCTAssertPathsEqual(_ filePaths: [FilePath], _ stringPaths: [String], file: StaticString = #file, line: UInt = #line) {