Skip to content

Commit

Permalink
Adjust code style
Browse files Browse the repository at this point in the history
  • Loading branch information
fredpi committed Sep 13, 2020
1 parent e4963d6 commit 6a19709
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 11 deletions.
12 changes: 5 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@

#### Enhancements

* None.
* Add option to specify a `child_config` / `parent_config` file
(local or remote) in any SwiftLint configuration file.
Allow passing multiple configuration files via the command line.
[Frederick Pietschmann](https://github.com/fredpi)
[#1352](https://github.com/realm/SwiftLint/issues/1352)

#### Bug Fixes

Expand Down Expand Up @@ -84,12 +88,6 @@
found issues.
[krin-san](https://github.com/krin-san)
[#3177](https://github.com/realm/SwiftLint/pull/3177)

* Add option to specify a `child_config` / `parent_config` file
(local or remote) in any SwiftLint configuration file.
Allow passing multiple configuration files via the command line.
[Frederick Pietschmann](https://github.com/fredpi)
[#1352](https://github.com/realm/SwiftLint/issues/1352)

* Add opt-in `ibinspectable_in_extension` rule to lint against `@IBInspectable`
properties in `extensions`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@ internal extension Configuration.FileGraph.FilePath {
private static let remoteCacheVersionNumber: String = "v1"

/// Use this to get the path to the cache directory for the current cache format
private static var versionedRemoteCachePath: String {
"\(remoteCachePath)/\(remoteCacheVersionNumber)"
}
private static let versionedRemoteCachePath: String = "\(remoteCachePath)/\(remoteCacheVersionNumber)"

// MARK: - Methods: Resolving
mutating func resolve(
Expand Down Expand Up @@ -199,7 +197,7 @@ internal extension Configuration.FileGraph.FilePath {

private func filePath(for urlString: String, rootDirectory: String) -> String {
let adjustedUrlString = urlString.replacingOccurrences(of: "/", with: "_")
let path = "\(Configuration.FileGraph.FilePath.versionedRemoteCachePath)" + "/\(adjustedUrlString).yml"
let path = Configuration.FileGraph.FilePath.versionedRemoteCachePath + "/\(adjustedUrlString).yml"
return path.bridge().absolutePathRepresentation(rootDirectory: rootDirectory)
}

Expand Down

0 comments on commit 6a19709

Please sign in to comment.