Skip to content

Commit 92efddf

Browse files
committed
Adjust code style
1 parent 9b98205 commit 92efddf

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

CHANGELOG.md

+5-7
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@
1010

1111
#### Enhancements
1212

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

1519
#### Bug Fixes
1620

@@ -129,12 +133,6 @@
129133
found issues.
130134
[krin-san](https://github.com/krin-san)
131135
[#3177](https://github.com/realm/SwiftLint/pull/3177)
132-
133-
* Add option to specify a `child_config` / `parent_config` file
134-
(local or remote) in any SwiftLint configuration file.
135-
Allow passing multiple configuration files via the command line.
136-
[Frederick Pietschmann](https://github.com/fredpi)
137-
[#1352](https://github.com/realm/SwiftLint/issues/1352)
138136

139137
* Add opt-in `ibinspectable_in_extension` rule to lint against `@IBInspectable`
140138
properties in `extensions`.

Source/SwiftLintFramework/Extensions/Configuration+Remote.swift

+2-4
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ internal extension Configuration.FileGraph.FilePath {
1313
private static let remoteCacheVersionNumber: String = "v1"
1414

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

2018
// MARK: - Methods: Resolving
2119
mutating func resolve(
@@ -199,7 +197,7 @@ internal extension Configuration.FileGraph.FilePath {
199197

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

0 commit comments

Comments
 (0)