Merge pull request #616 from 417-72KI/fix-swiftlint-package

417-72KI · web-flow · commit 9f2d6b816cfd · 2024-08-29T01:08:10.000+09:00
Fix pattern for detecting SwiftLint in package
diff --git a/Sources/Danger/Plugins/SwiftLint/SwiftLint.swift b/Sources/Danger/Plugins/SwiftLint/SwiftLint.swift
@@ -253,7 +253,7 @@ extension SwiftLint {
     }
 
     static func swiftlintDefaultPath(packagePath: String = "Package.swift") -> String {
-        let swiftPackageDepPattern = #"\.package\(.*SwiftLint.*"#
+        let swiftPackageDepPattern = #"\.package\(.*SwiftLint(\.git)?".*"#
         if let packageContent = try? String(contentsOfFile: packagePath),
            let regex = try? NSRegularExpression(pattern: swiftPackageDepPattern, options: .allowCommentsAndWhitespace),
            regex.firstMatchingString(in: packageContent) != nil {

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ extension SwiftLint {`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`static func swiftlintDefaultPath(packagePath: String = "Package.swift") -> String {`
`256`		`- let swiftPackageDepPattern = #"\.package\(.SwiftLint."#`
	`256`	`+ let swiftPackageDepPattern = #"\.package\(.SwiftLint(\.git)?"."#`
`257`	`257`	`if let packageContent = try? String(contentsOfFile: packagePath),`
`258`	`258`	`let regex = try? NSRegularExpression(pattern: swiftPackageDepPattern, options: .allowCommentsAndWhitespace),`
`259`	`259`	`regex.firstMatchingString(in: packageContent) != nil {`