Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename OverridenSuperCallConfiguration to fix typo #3426

Merged
merged 2 commits into from
Nov 11, 2020
Merged

Rename OverridenSuperCallConfiguration to fix typo #3426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a0eb67
chore: rename OverridenSuperCallConfiguration to OverriddenSuperCallC…
bricker Nov 10, 2020
999bfbd
Fix consoleDescription for OverriddenSuperCallConfiguration
bricker Nov 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@
Defaults to `true`.
[Skoti](https://github.com/Skoti)

* Renamed `OverridenSuperCallConfiguration` to
`OverriddenSuperCallConfiguration`.
[Bryan Ricker](https://github.com/bricker)
[#3426](https://github.com/realm/SwiftLint/pull/3426)

#### Experimental

* None.
Expand Down
2 changes: 1 addition & 1 deletion Source/SwiftLintFramework/Rules/Lint/OverriddenSuperCallRule.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import SourceKittenFramework

public struct OverriddenSuperCallRule: ConfigurationProviderRule, ASTRule, OptInRule, AutomaticTestableRule {
public var configuration = OverridenSuperCallConfiguration()
public var configuration = OverriddenSuperCallConfiguration()

public init() {}

Expand Down
6 changes: 3 additions & 3 deletions ...ons/OverridenSuperCallConfiguration.swift → ...ns/OverriddenSuperCallConfiguration.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
public struct OverridenSuperCallConfiguration: RuleConfiguration, Equatable {
public struct OverriddenSuperCallConfiguration: RuleConfiguration, Equatable {
private let defaultIncluded = [
// NSObject
"awakeFromNib()",
Expand Down Expand Up @@ -46,8 +46,8 @@ public struct OverridenSuperCallConfiguration: RuleConfiguration, Equatable {

public var consoleDescription: String {
return severityConfiguration.consoleDescription +
", excluded: [\(excluded)]" +
", included: [\(included)]"
", excluded: \(excluded)" +
", included: \(included)"
}

public mutating func apply(configuration: Any) throws {
Expand Down
2 changes: 1 addition & 1 deletion Tests/LinuxMain.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1362,7 +1362,7 @@ extension RuleConfigurationTests {
("testTrailingWhitespaceConfigurationApplyConfigurationSetsIgnoresComments", testTrailingWhitespaceConfigurationApplyConfigurationSetsIgnoresComments),
("testTrailingWhitespaceConfigurationCompares", testTrailingWhitespaceConfigurationCompares),
("testTrailingWhitespaceConfigurationApplyConfigurationUpdatesSeverityConfiguration", testTrailingWhitespaceConfigurationApplyConfigurationUpdatesSeverityConfiguration),
("testOverridenSuperCallConfigurationFromDictionary", testOverridenSuperCallConfigurationFromDictionary),
("testOverriddenSuperCallConfigurationFromDictionary", testOverriddenSuperCallConfigurationFromDictionary),
("testModifierOrderConfigurationFromDictionary", testModifierOrderConfigurationFromDictionary),
("testModifierOrderConfigurationThrowsOnUnrecognizedModifierGroup", testModifierOrderConfigurationThrowsOnUnrecognizedModifierGroup),
("testModifierOrderConfigurationThrowsOnNonModifiableGroup", testModifierOrderConfigurationThrowsOnNonModifiableGroup),
Expand Down
4 changes: 2 additions & 2 deletions Tests/SwiftLintFrameworkTests/RuleConfigurationTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,8 +274,8 @@ class RuleConfigurationTests: XCTestCase {
}
}

func testOverridenSuperCallConfigurationFromDictionary() {
var configuration = OverridenSuperCallConfiguration()
func testOverriddenSuperCallConfigurationFromDictionary() {
var configuration = OverriddenSuperCallConfiguration()
XCTAssertTrue(configuration.resolvedMethodNames.contains("viewWillAppear(_:)"))

let conf1 = ["severity": "error", "excluded": "viewWillAppear(_:)"]
Expand Down