dnrops
/
SwiftLint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Report violations in all `<scope>_length` rules when error < warning threshold (#4647)

This commit is contained in:
Danny Mösch 2023-01-01 23:15:36 +01:00 committed by GitHub
parent 470d471e51
commit 64d9619a8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -24,6 +24,11 @@
#### Bug Fixes
* Report violations in all `<scope>_length` rules when the error threshold is
smaller than the warning threshold.
[SimplyDanny](https://github.com/SimplyDanny)
[#4645](https://github.com/realm/SwiftLint/issues/4645)
* Fix false positives on `private_subject` rule when using
subjects inside functions.
[Marcelo Fabri](https://github.com/marcelofabri)

18
Source/SwiftLintFramework/Visitors/BodyLengthRuleVisitor.swift
View File

@ -115,19 +115,19 @@ final class BodyLengthRuleVisitor: ViolationsSyntaxVisitor {
let lineCount = file.bodyLineCountIgnoringCommentsAndWhitespace(leftBraceLine: leftBraceLine,
rightBraceLine: rightBraceLine)
guard lineCount > configuration.warning else {
let severity: ViolationSeverity, upperBound: Int
if let error = configuration.error, lineCount > error {
severity = .error
upperBound = error
} else if lineCount > configuration.warning {
severity = .warning
upperBound = configuration.warning
} else {
return
}
let severity: ViolationSeverity
if let error = configuration.error, lineCount > error {
severity = .error
} else {
severity = .warning
}
let reason = """
\(kind.name) body should span \(configuration.warning) lines or less excluding comments and whitespace: \
\(kind.name) body should span \(upperBound) lines or less excluding comments and whitespace: \
currently spans \(lineCount) lines
"""

19
Tests/SwiftLintFrameworkTests/FunctionBodyLengthRuleTests.swift
View File

@ -67,8 +67,23 @@ class FunctionBodyLengthRuleTests: XCTestCase {
"whitespace: currently spans 51 lines")])
}
private func violations(_ example: Example) -> [StyleViolation] {
let config = makeConfig(nil, FunctionBodyLengthRule.description.identifier)!
func testConfiguration() {
let function = violatingFuncWithBody(repeatElement("x = 0\n", count: 10).joined())
XCTAssertEqual(self.violations(function, configuration: ["warning": 12]).count, 0)
XCTAssertEqual(self.violations(function, configuration: ["warning": 12, "error": 14]).count, 0)
XCTAssertEqual(
self.violations(function, configuration: ["warning": 8]).map(\.reason),
["Function body should span 8 lines or less excluding comments and whitespace: currently spans 10 lines"]
)
XCTAssertEqual(
self.violations(function, configuration: ["warning": 12, "error": 8]).map(\.reason),
["Function body should span 8 lines or less excluding comments and whitespace: currently spans 10 lines"]
)
}
private func violations(_ example: Example, configuration: Any? = nil) -> [StyleViolation] {
let config = makeConfig(configuration, FunctionBodyLengthRule.description.identifier)!
return SwiftLintFrameworkTests.violations(example, config: config)
}
}